diff --git a/src/blockchain/any.rs b/src/blockchain/any.rs
index 5ef1a3385..96b6639f0 100644
--- a/src/blockchain/any.rs
+++ b/src/blockchain/any.rs
@@ -84,7 +84,7 @@ pub enum AnyBlockchain {
     #[cfg(feature = "compact_filters")]
     #[cfg_attr(docsrs, doc(cfg(feature = "compact_filters")))]
     /// Compact filters client
-    CompactFilters(Box<compact_filters::CompactFiltersBlockchain>),
+    CompactFilters(Box<compact_filters::nakamoto::CbfNode>),
     #[cfg(feature = "rpc")]
     #[cfg_attr(docsrs, doc(cfg(feature = "rpc")))]
     /// RPC client
@@ -158,7 +158,7 @@ impl WalletSync for AnyBlockchain {
 
 impl_from!(boxed electrum::ElectrumBlockchain, AnyBlockchain, Electrum, #[cfg(feature = "electrum")]);
 impl_from!(boxed esplora::EsploraBlockchain, AnyBlockchain, Esplora, #[cfg(feature = "esplora")]);
-impl_from!(boxed compact_filters::CompactFiltersBlockchain, AnyBlockchain, CompactFilters, #[cfg(feature = "compact_filters")]);
+impl_from!(boxed compact_filters::nakamoto::CbfNode, AnyBlockchain, CompactFilters, #[cfg(feature = "compact_filters")]);
 impl_from!(boxed rpc::RpcBlockchain, AnyBlockchain, Rpc, #[cfg(feature = "rpc")]);
 
 /// Type that can contain any of the blockchain configurations defined by the library
@@ -208,7 +208,7 @@ pub enum AnyBlockchainConfig {
     #[cfg(feature = "compact_filters")]
     #[cfg_attr(docsrs, doc(cfg(feature = "compact_filters")))]
     /// Compact filters client
-    CompactFilters(compact_filters::CompactFiltersBlockchainConfig),
+    CompactFilters(compact_filters::nakamoto::CBFConfig),
     #[cfg(feature = "rpc")]
     #[cfg_attr(docsrs, doc(cfg(feature = "rpc")))]
     /// RPC client configuration
@@ -230,7 +230,7 @@ impl ConfigurableBlockchain for AnyBlockchain {
             }
             #[cfg(feature = "compact_filters")]
             AnyBlockchainConfig::CompactFilters(inner) => AnyBlockchain::CompactFilters(Box::new(
-                compact_filters::CompactFiltersBlockchain::from_config(inner)?,
+                compact_filters::nakamoto::CbfNode::from_config(inner)?,
             )),
             #[cfg(feature = "rpc")]
             AnyBlockchainConfig::Rpc(inner) => {
@@ -242,5 +242,5 @@ impl ConfigurableBlockchain for AnyBlockchain {
 
 impl_from!(electrum::ElectrumBlockchainConfig, AnyBlockchainConfig, Electrum, #[cfg(feature = "electrum")]);
 impl_from!(esplora::EsploraBlockchainConfig, AnyBlockchainConfig, Esplora, #[cfg(feature = "esplora")]);
-impl_from!(compact_filters::CompactFiltersBlockchainConfig, AnyBlockchainConfig, CompactFilters, #[cfg(feature = "compact_filters")]);
+impl_from!(compact_filters::nakamoto::CBFConfig, AnyBlockchainConfig, CompactFilters, #[cfg(feature = "compact_filters")]);
 impl_from!(rpc::RpcConfig, AnyBlockchainConfig, Rpc, #[cfg(feature = "rpc")]);