diff --git a/include/xrpl/protocol/ConfidentialTransfer.h b/include/xrpl/protocol/ConfidentialTransfer.h
index aded57ab5d..3ffefc104c 100644
--- a/include/xrpl/protocol/ConfidentialTransfer.h
+++ b/include/xrpl/protocol/ConfidentialTransfer.h
@@ -15,7 +15,7 @@
 
 #include <secp256k1.h>
 
-namespace ripple {
+namespace xrpl {
 // Helper struct to bundle the ElGamal Public Key and the associated Ciphertext
 struct ConfidentialRecipient
 {
@@ -505,6 +505,6 @@ secp256k1_mpt_verify_same_plaintext_multi(
     secp256k1_pubkey const* S,
     secp256k1_pubkey const* Pk,
     unsigned char const* tx_id);
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif
diff --git a/include/xrpl/protocol/detail/transactions.macro b/include/xrpl/protocol/detail/transactions.macro
index 02847a51e5..dbcf633b87 100644
--- a/include/xrpl/protocol/detail/transactions.macro
+++ b/include/xrpl/protocol/detail/transactions.macro
@@ -1065,7 +1065,7 @@ TRANSACTION(ttLOAN_PAY, 84, LoanPay,
 #include <xrpld/app/tx/detail/ConfidentialConvert.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_CONVERT, 85, ConfidentialConvert,
-    Delegation::delegatable,
+    Delegation::delegable,
     featureConfidentialTransfer,
     noPriv,
     ({
@@ -1084,7 +1084,7 @@ TRANSACTION(ttCONFIDENTIAL_CONVERT, 85, ConfidentialConvert,
 #include <xrpld/app/tx/detail/ConfidentialMergeInbox.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_MERGE_INBOX, 86, ConfidentialMergeInbox,
-    Delegation::delegatable,
+    Delegation::delegable,
     featureConfidentialTransfer,
     noPriv,
     ({
@@ -1096,7 +1096,7 @@ TRANSACTION(ttCONFIDENTIAL_MERGE_INBOX, 86, ConfidentialMergeInbox,
 #include <xrpld/app/tx/detail/ConfidentialConvertBack.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_CONVERT_BACK, 87, ConfidentialConvertBack,
-    Delegation::delegatable,
+    Delegation::delegable,
     featureConfidentialTransfer,
     noPriv,
     ({
@@ -1114,7 +1114,7 @@ TRANSACTION(ttCONFIDENTIAL_CONVERT_BACK, 87, ConfidentialConvertBack,
 #include <xrpld/app/tx/detail/ConfidentialSend.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_SEND, 88, ConfidentialSend,
-    Delegation::delegatable,
+    Delegation::delegable,
     featureConfidentialTransfer,
     noPriv,
     ({
@@ -1134,7 +1134,7 @@ TRANSACTION(ttCONFIDENTIAL_SEND, 88, ConfidentialSend,
 #include <xrpld/app/tx/detail/ConfidentialClawback.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_CLAWBACK, 89, ConfidentialClawback,
-    Delegation::delegatable,
+    Delegation::delegable,
     featureConfidentialTransfer,
     noPriv,
     ({
diff --git a/src/libxrpl/protocol/ConfidentialTransfer.cpp b/src/libxrpl/protocol/ConfidentialTransfer.cpp
index 7bee2c20d7..3980513a03 100644
--- a/src/libxrpl/protocol/ConfidentialTransfer.cpp
+++ b/src/libxrpl/protocol/ConfidentialTransfer.cpp
@@ -4,7 +4,7 @@
 #include <openssl/rand.h>
 #include <openssl/sha.h>
 
-namespace ripple {
+namespace xrpl {
 void
 addCommonZKPFields(
     Serializer& s,
@@ -1961,4 +1961,4 @@ secp256k1_mpt_verify_same_plaintext_multi(
     return 1;
 }
 
-}  // namespace ripple
+}  // namespace xrpl
diff --git a/src/test/app/ConfidentialTransfer_test.cpp b/src/test/app/ConfidentialTransfer_test.cpp
index 0532f99186..c2bbf8a8e1 100644
--- a/src/test/app/ConfidentialTransfer_test.cpp
+++ b/src/test/app/ConfidentialTransfer_test.cpp
@@ -5,7 +5,7 @@
 
 #include <openssl/rand.h>
 
-namespace ripple {
+namespace xrpl {
 
 class ConfidentialTransfer_test : public beast::unit_test::suite
 {
@@ -3501,4 +3501,4 @@ public:
 };
 
 BEAST_DEFINE_TESTSUITE(ConfidentialTransfer, app, ripple);
-}  // namespace ripple
+}  // namespace xrpl
diff --git a/src/test/jtx/impl/mpt.cpp b/src/test/jtx/impl/mpt.cpp
index d906daafa8..9af6b5b852 100644
--- a/src/test/jtx/impl/mpt.cpp
+++ b/src/test/jtx/impl/mpt.cpp
@@ -1623,7 +1623,7 @@ MPTTester::encryptAmount(
     if (auto const pubKey = getPubKey(account))
     {
         if (auto const result =
-                ripple::encryptAmount(amt, *pubKey, blindingFactor))
+                xrpl::encryptAmount(amt, *pubKey, blindingFactor))
             return *result;
     }
 
diff --git a/src/xrpld/app/tx/detail/ConfidentialClawback.cpp b/src/xrpld/app/tx/detail/ConfidentialClawback.cpp
index a160ceb895..4b780d29b0 100644
--- a/src/xrpld/app/tx/detail/ConfidentialClawback.cpp
+++ b/src/xrpld/app/tx/detail/ConfidentialClawback.cpp
@@ -8,7 +8,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
 
-namespace ripple {
+namespace xrpl {
 
 NotTEC
 ConfidentialClawback::preflight(PreflightContext const& ctx)
@@ -162,4 +162,4 @@ ConfidentialClawback::doApply()
 
     return tesSUCCESS;
 }
-}  // namespace ripple
+}  // namespace xrpl
diff --git a/src/xrpld/app/tx/detail/ConfidentialClawback.h b/src/xrpld/app/tx/detail/ConfidentialClawback.h
index cb8471c1bc..c31fdaf69e 100644
--- a/src/xrpld/app/tx/detail/ConfidentialClawback.h
+++ b/src/xrpld/app/tx/detail/ConfidentialClawback.h
@@ -3,7 +3,7 @@
 
 #include <xrpld/app/tx/detail/Transactor.h>
 
-namespace ripple {
+namespace xrpl {
 
 class ConfidentialClawback : public Transactor
 {
@@ -24,6 +24,6 @@ public:
     doApply() override;
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif
diff --git a/src/xrpld/app/tx/detail/ConfidentialConvert.cpp b/src/xrpld/app/tx/detail/ConfidentialConvert.cpp
index feacc3036d..4319df14f7 100644
--- a/src/xrpld/app/tx/detail/ConfidentialConvert.cpp
+++ b/src/xrpld/app/tx/detail/ConfidentialConvert.cpp
@@ -8,7 +8,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
 
-namespace ripple {
+namespace xrpl {
 
 NotTEC
 ConfidentialConvert::preflight(PreflightContext const& ctx)
@@ -259,4 +259,4 @@ ConfidentialConvert::doApply()
     return tesSUCCESS;
 }
 
-}  // namespace ripple
+}  // namespace xrpl
diff --git a/src/xrpld/app/tx/detail/ConfidentialConvert.h b/src/xrpld/app/tx/detail/ConfidentialConvert.h
index f5f7d2b010..dbf543a1d1 100644
--- a/src/xrpld/app/tx/detail/ConfidentialConvert.h
+++ b/src/xrpld/app/tx/detail/ConfidentialConvert.h
@@ -3,7 +3,7 @@
 
 #include <xrpld/app/tx/detail/Transactor.h>
 
-namespace ripple {
+namespace xrpl {
 
 class ConfidentialConvert : public Transactor
 {
@@ -24,6 +24,6 @@ public:
     doApply() override;
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif
diff --git a/src/xrpld/app/tx/detail/ConfidentialConvertBack.cpp b/src/xrpld/app/tx/detail/ConfidentialConvertBack.cpp
index d40c814b04..d1f08676c0 100644
--- a/src/xrpld/app/tx/detail/ConfidentialConvertBack.cpp
+++ b/src/xrpld/app/tx/detail/ConfidentialConvertBack.cpp
@@ -10,7 +10,7 @@
 
 #include <cstddef>
 
-namespace ripple {
+namespace xrpl {
 
 NotTEC
 ConfidentialConvertBack::preflight(PreflightContext const& ctx)
@@ -248,4 +248,4 @@ ConfidentialConvertBack::doApply()
     return tesSUCCESS;
 }
 
-}  // namespace ripple
+}  // namespace xrpl
diff --git a/src/xrpld/app/tx/detail/ConfidentialConvertBack.h b/src/xrpld/app/tx/detail/ConfidentialConvertBack.h
index a91e765dd7..f69b807394 100644
--- a/src/xrpld/app/tx/detail/ConfidentialConvertBack.h
+++ b/src/xrpld/app/tx/detail/ConfidentialConvertBack.h
@@ -3,7 +3,7 @@
 
 #include <xrpld/app/tx/detail/Transactor.h>
 
-namespace ripple {
+namespace xrpl {
 
 class ConfidentialConvertBack : public Transactor
 {
@@ -24,6 +24,6 @@ public:
     doApply() override;
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif
diff --git a/src/xrpld/app/tx/detail/ConfidentialMergeInbox.cpp b/src/xrpld/app/tx/detail/ConfidentialMergeInbox.cpp
index 998ea94f27..d8caec87cf 100644
--- a/src/xrpld/app/tx/detail/ConfidentialMergeInbox.cpp
+++ b/src/xrpld/app/tx/detail/ConfidentialMergeInbox.cpp
@@ -7,7 +7,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
 
-namespace ripple {
+namespace xrpl {
 
 NotTEC
 ConfidentialMergeInbox::preflight(PreflightContext const& ctx)
@@ -94,4 +94,4 @@ ConfidentialMergeInbox::doApply()
     return tesSUCCESS;
 }
 
-}  // namespace ripple
+}  // namespace xrpl
diff --git a/src/xrpld/app/tx/detail/ConfidentialMergeInbox.h b/src/xrpld/app/tx/detail/ConfidentialMergeInbox.h
index 2b6e309a7c..ce7ba15632 100644
--- a/src/xrpld/app/tx/detail/ConfidentialMergeInbox.h
+++ b/src/xrpld/app/tx/detail/ConfidentialMergeInbox.h
@@ -3,7 +3,7 @@
 
 #include <xrpld/app/tx/detail/Transactor.h>
 
-namespace ripple {
+namespace xrpl {
 
 class ConfidentialMergeInbox : public Transactor
 {
@@ -24,6 +24,6 @@ public:
     doApply() override;
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif
diff --git a/src/xrpld/app/tx/detail/ConfidentialSend.cpp b/src/xrpld/app/tx/detail/ConfidentialSend.cpp
index 5bc315d1a9..ba123ba1a1 100644
--- a/src/xrpld/app/tx/detail/ConfidentialSend.cpp
+++ b/src/xrpld/app/tx/detail/ConfidentialSend.cpp
@@ -9,7 +9,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
 
-namespace ripple {
+namespace xrpl {
 
 NotTEC
 ConfidentialSend::preflight(PreflightContext const& ctx)
@@ -411,4 +411,4 @@ ConfidentialSend::doApply()
     view().update(sleDestinationMPToken);
     return tesSUCCESS;
 }
-}  // namespace ripple
+}  // namespace xrpl
diff --git a/src/xrpld/app/tx/detail/ConfidentialSend.h b/src/xrpld/app/tx/detail/ConfidentialSend.h
index bb6100de30..165bdcaee2 100644
--- a/src/xrpld/app/tx/detail/ConfidentialSend.h
+++ b/src/xrpld/app/tx/detail/ConfidentialSend.h
@@ -3,7 +3,7 @@
 
 #include <xrpld/app/tx/detail/Transactor.h>
 
-namespace ripple {
+namespace xrpl {
 
 class ConfidentialSend : public Transactor
 {
@@ -24,6 +24,6 @@ public:
     doApply() override;
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif