diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp
index 1649a119ce..e67940c45f 100644
--- a/src/test/app/AMM_test.cpp
+++ b/src/test/app/AMM_test.cpp
@@ -7097,7 +7097,7 @@ private:
         // Vaults rely on featureSingleAssetVault (which the AMM_test class
         // strips by default). MPT-AMM pairs require featureMPTokensV2.
         FeatureBitset const features{
-            jtx::testable_amendments() | featureSingleAssetVault | featureMPTokensV2};
+            jtx::testableAmendments() | featureSingleAssetVault | featureMPTokensV2};
 
         Env env{*this, features};
 
@@ -7177,7 +7177,7 @@ private:
         using namespace jtx;
 
         FeatureBitset const features{
-            jtx::testable_amendments() | featureSingleAssetVault | featureMPTokensV2};
+            jtx::testableAmendments() | featureSingleAssetVault | featureMPTokensV2};
 
         Env env{*this, features};
 
@@ -7188,14 +7188,14 @@ private:
         env.fund(XRP(1'000'000), issuer, owner, trader);
         env.close();
 
-        // Underlying MPT supports lock + clawback. MPTDEXFlags adds
+        // Underlying MPT supports lock + clawback. kMPT_DEX_FLAGS adds
         // CanTransfer + CanTrade so the vault and AMM can route it.
         MPTTester mpt(
             {.env = env,
              .issuer = issuer,
              .holders = {owner},
              .pay = 100'000,
-             .flags = tfMPTCanLock | tfMPTCanClawback | MPTDEXFlags});
+             .flags = tfMPTCanLock | tfMPTCanClawback | kMPT_DEX_FLAGS});
         PrettyAsset const asset = MPT(mpt);
 
         // Create the vault.
@@ -7256,7 +7256,7 @@ private:
         // cascades through the vault-share issuance via
         // isVaultPseudoAccountFrozen, so the AMM-routed Payment fails.
         STAmount const quarterLpt(lptIssue, lptOwner0.mantissa() / 4, lptOwner0.exponent());
-        env(pay(owner, trader, quarterLpt), ter(tecPATH_DRY));
+        env(pay(owner, trader, quarterLpt), Ter(tecPATH_DRY));
         env.close();
         // Trader's balance is still just the half from before the lock.
         BEAST_EXPECT(env.balance(trader, lptIssue) == halfLpt);
@@ -7264,7 +7264,7 @@ private:
         // Step 4: try to cash out the LP tokens. The AMM withdrawal must
         // touch the vault-share side, which is now treated as frozen
         // because its underlying is locked, so the withdrawal fails.
-        ammOwner.withdrawAll(trader, std::nullopt, ter(tecFROZEN));
+        ammOwner.withdrawAll(trader, std::nullopt, Ter(tecFROZEN));
         env.close();
         // Trader still holds the LP tokens; nothing was redeemed.
         BEAST_EXPECT(env.balance(trader, lptIssue) == halfLpt);
diff --git a/src/test/app/Vault_test.cpp b/src/test/app/Vault_test.cpp
index 982aaaae21..256aa93b01 100644
--- a/src/test/app/Vault_test.cpp
+++ b/src/test/app/Vault_test.cpp
@@ -6160,7 +6160,7 @@ class Vault_test : public beast::unit_test::Suite
         using namespace test::jtx;
         testcase("MPT vault: clearing CanTransfer/CanTrade after deposit");
 
-        Env env{*this, testable_amendments() | featureSingleAssetVault};
+        Env env{*this, testableAmendments() | featureSingleAssetVault};
 
         Account const issuer{"issuer"};
         Account const alice{"alice"};
@@ -6172,7 +6172,7 @@ class Vault_test : public beast::unit_test::Suite
         // MPT is transferable, tradable, lockable, and clawback-capable. Both
         // CanTransfer and CanTrade are mutable so the issuer can flip them
         // later via MPTokenIssuanceSet.
-        MPTTester mptt{env, issuer, mptInitNoFund};
+        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
         mptt.create(
             {.flags = tfMPTCanTransfer | tfMPTCanTrade | tfMPTCanLock | tfMPTCanClawback,
              .mutableFlags = tmfMPTCanMutateCanTransfer | tmfMPTCanMutateCanTrade});
@@ -6211,11 +6211,11 @@ class Vault_test : public beast::unit_test::Suite
         //    account is neither sender nor receiver = issuer, so
         //    canTransfer returns tecNO_AUTH.
         env(vault.deposit({.depositor = alice, .id = vaultKeylet.key, .amount = asset(1'000)}),
-            ter(tecNO_AUTH));
+            Ter(tecNO_AUTH));
         env(vault.withdraw({.depositor = alice, .id = vaultKeylet.key, .amount = asset(1'000)}),
-            ter(tecNO_AUTH));
+            Ter(tecNO_AUTH));
         env(vault.withdraw({.depositor = bob, .id = vaultKeylet.key, .amount = asset(1'000)}),
-            ter(tecNO_AUTH));
+            Ter(tecNO_AUTH));
         env.close();
 
         // 3. Issuer-as-depositor is exempt — `canTransfer` short-circuits
@@ -6253,7 +6253,7 @@ class Vault_test : public beast::unit_test::Suite
         // Holder ops still fail the same way (CanTransfer-driven), and the
         // issuer is still exempt.
         env(vault.withdraw({.depositor = alice, .id = vaultKeylet.key, .amount = asset(1'000)}),
-            ter(tecNO_AUTH));
+            Ter(tecNO_AUTH));
         env(vault.deposit({.depositor = issuer, .id = vaultKeylet.key, .amount = asset(1'000)}));
         env.close();