diff --git a/xo-refcnt/utest/intrusive_ptr.test.cpp b/xo-refcnt/utest/intrusive_ptr.test.cpp
index 78e3181a..7bc931da 100644
--- a/xo-refcnt/utest/intrusive_ptr.test.cpp
+++ b/xo-refcnt/utest/intrusive_ptr.test.cpp
@@ -9,7 +9,6 @@
 namespace xo {
     using xo::ref::Refcount;
     using xo::ref::Borrow;
-    using xo::ref::brw;
     using xo::ref::intrusive_ptr_refcount;
     using xo::ref::intrusive_ptr_add_ref;
     using xo::ref::intrusive_ptr_release;
@@ -71,8 +70,8 @@ namespace xo {
             intrusive_ptr_release(nullptr);
 
             /* can borrow a null intrusive_ptr */
-            brw<JustRefcount> p1_brw = p1.borrow();
-            brw<JustRefcount> p2_brw = p2.borrow();
+            bp<JustRefcount> p1_brw = p1.borrow();
+            bp<JustRefcount> p2_brw = p2.borrow();
 
             REQUIRE(p1_brw.get() == nullptr);
             REQUIRE(p1_brw.operator->() == nullptr);
diff --git a/xo-simulator/include/xo/simulator/Simulator.hpp b/xo-simulator/include/xo/simulator/Simulator.hpp
index da87b555..37c696cf 100644
--- a/xo-simulator/include/xo/simulator/Simulator.hpp
+++ b/xo-simulator/include/xo/simulator/Simulator.hpp
@@ -97,7 +97,7 @@ namespace xo {
             /* true iff src has been added to this simulator
              * (by .add_source())
              */
-            bool is_source_present(ref::brw<ReactorSource> src) const;
+            bool is_source_present(bp<ReactorSource> src) const;
 
             /* promise:
              *   .next_tm() > .t0() || .is_exhausted()
@@ -199,21 +199,21 @@ namespace xo {
 
             /* notification when nonprimed source becomes primed
              */
-            virtual void notify_source_primed(ref::brw<ReactorSource> src) override;
+            virtual void notify_source_primed(bp<ReactorSource> src) override;
 
             /* add a new simulation source.
              * event that precede .t0 will be discarded.
              *
              * returns true if src added;  false if already present
              */
-            virtual bool add_source(ref::brw<ReactorSource> src) override;
+            virtual bool add_source(bp<ReactorSource> src) override;
 
             /* remove simulation source.
              * returns true if src removed;  false if was not present
              *
              * (not typically needed for simulations)
              */
-            virtual bool remove_source(ref::brw<ReactorSource> src) override;
+            virtual bool remove_source(bp<ReactorSource> src) override;
 
             /* synonym for .advance_one_event() */
             virtual std::uint64_t run_one() override;
@@ -245,9 +245,9 @@ namespace xo {
             void complete_delivery_work();
 
             /* complete reentrant call to .add_source() */
-            void complete_add_source(ref::brw<ReactorSource> src);
+            void complete_add_source(bp<ReactorSource> src);
             /* complete reentrant call to .remove_source() */
-            void complete_remove_source(ref::brw<ReactorSource> src);
+            void complete_remove_source(bp<ReactorSource> src);
 
             friend class RaiiDeliveryWork;
 
diff --git a/xo-simulator/src/simulator/Simulator.cpp b/xo-simulator/src/simulator/Simulator.cpp
index 3d64c1b4..344e8997 100644
--- a/xo-simulator/src/simulator/Simulator.cpp
+++ b/xo-simulator/src/simulator/Simulator.cpp
@@ -11,7 +11,6 @@
 
 namespace xo {
     using xo::reactor::ReactorSource;
-    using xo::ref::brw;
     using xo::time::utc_nanos;
     using xo::time::nanos;
 
@@ -58,7 +57,7 @@ namespace xo {
         } /*dtor*/
 
         bool
-        Simulator::is_source_present(brw<ReactorSource> src) const
+        Simulator::is_source_present(bp<ReactorSource> src) const
         {
             for (ReactorSourcePtr const & s : this->src_v_) {
                 if (s == src)
@@ -89,12 +88,12 @@ namespace xo {
         } /*next_src*/
 
         void
-        Simulator::notify_source_primed(brw<ReactorSource> src)
+        Simulator::notify_source_primed(bp<ReactorSource> src)
         {
             scope log(XO_ENTER1(always, src->debug_sim_flag()));
 
-            brw<ReactorSource> sim_src
-                = brw<ReactorSource>::from(src);
+            bp<ReactorSource> sim_src
+                = bp<ReactorSource>::from(src);
 
             log && log(xtag("src", (sim_src.get() != nullptr)),
                        xtag("src.name", src->name()));
@@ -131,7 +130,7 @@ namespace xo {
         } /*notify_source_primed*/
 
         void
-        Simulator::complete_add_source(brw<ReactorSource> src)
+        Simulator::complete_add_source(bp<ReactorSource> src)
         {
             /* also add to simulation heap */
             this->sim_heap_.push_back(SourceTimestamp(src->sim_current_tm(),
@@ -146,7 +145,7 @@ namespace xo {
         } /*complete_add_source*/
 
         bool
-        Simulator::add_source(brw<ReactorSource> sim_src)
+        Simulator::add_source(bp<ReactorSource> sim_src)
         {
             scope log(XO_ENTER1(always, sim_src->debug_sim_flag()));
 
diff --git a/xo-websock/src/websock/WebsocketSink.cpp b/xo-websock/src/websock/WebsocketSink.cpp
index eccfec07..caa88892 100644
--- a/xo-websock/src/websock/WebsocketSink.cpp
+++ b/xo-websock/src/websock/WebsocketSink.cpp
@@ -16,7 +16,6 @@ namespace xo {
     using xo::reflect::Reflect;
     using xo::reflect::TaggedPtr;
     using xo::reflect::TypeDescr;
-    using xo::ref::brw;
     using xo::print::quot;
     using xo::print::qcstr;
     using xo::scope;
@@ -48,7 +47,7 @@ namespace xo {
             virtual std::string const & name() const override { return name_; }
             virtual void set_name(std::string const & x) override { this->name_ = x; }
             /* 0 consumers for websocket sink,  since it's not a source */
-            virtual void visit_direct_consumers(std::function<void (brw<AbstractEventProcessor>)> const &) override {}
+            virtual void visit_direct_consumers(std::function<void (bp<AbstractEventProcessor>)> const &) override {}
             virtual void display(std::ostream & os) const override;
 
             virtual bool allow_polymorphic_source() const override { return true; }