diff --git a/src/core/dune b/src/core/dune
index 6e103f44..d4454309 100644
--- a/src/core/dune
+++ b/src/core/dune
@@ -5,7 +5,7 @@
   moonpool.private
   (re_export thread-local-storage)
   moonpool.dpool
-  (re_export picos.exn_bt)
+  (re_export exn_bt)
   (re_export picos))
  (flags :standard -open Moonpool_private)
  (private_modules util_pool_)
diff --git a/src/core/moonpool.ml b/src/core/moonpool.ml
index 47e5e5e3..50d25721 100644
--- a/src/core/moonpool.ml
+++ b/src/core/moonpool.ml
@@ -23,7 +23,7 @@ module Blocking_queue = Bb_queue
 module Background_thread = Background_thread
 module Bounded_queue = Bounded_queue
 module Chan = Chan
-module Exn_bt = Exn_bt
+module Exn_bt = Moonpool_exn_bt
 module Fifo_pool = Fifo_pool
 module Fut = Fut
 module Lock = Lock
diff --git a/src/core/moonpool.mli b/src/core/moonpool.mli
index a992e8b8..4f648868 100644
--- a/src/core/moonpool.mli
+++ b/src/core/moonpool.mli
@@ -21,7 +21,7 @@ module Immediate_runner : sig end
 
     This is removed since 0.6, and replaced by {!Moonpool_fib.Main}. *)
 
-module Exn_bt = Exn_bt
+module Exn_bt = Moonpool_exn_bt
 
 exception Shutdown
 (** Exception raised when trying to run tasks on
diff --git a/src/core/exn_bt.ml b/src/core/moonpool_exn_bt.ml
similarity index 93%
rename from src/core/exn_bt.ml
rename to src/core/moonpool_exn_bt.ml
index 170db278..ab9e2649 100644
--- a/src/core/exn_bt.ml
+++ b/src/core/moonpool_exn_bt.ml
@@ -1,4 +1,4 @@
-include Picos_exn_bt
+include Exn_bt
 
 let[@inline] make exn bt : t = { exn; bt }
 let[@inline] exn self = self.exn
diff --git a/src/core/exn_bt.mli b/src/core/moonpool_exn_bt.mli
similarity index 95%
rename from src/core/exn_bt.mli
rename to src/core/moonpool_exn_bt.mli
index 55ff8177..1f09f756 100644
--- a/src/core/exn_bt.mli
+++ b/src/core/moonpool_exn_bt.mli
@@ -6,7 +6,7 @@
 
 (** An exception bundled with a backtrace *)
 include module type of struct
-  include Picos_exn_bt
+  include Exn_bt
 end
 
 val exn : t -> exn
diff --git a/src/core/types_.ml b/src/core/types_.ml
index 20133108..afafbba6 100644
--- a/src/core/types_.ml
+++ b/src/core/types_.ml
@@ -12,10 +12,7 @@ type runner = {
 }
 
 let k_cur_runner : runner TLS.t = TLS.create ()
-[@@alert todo "remove me asap, done via picos now"]
-
 let k_cur_fiber : fiber TLS.t = TLS.create ()
-[@@alert todo "remove me asap, done via picos now"]
 
 let _dummy_computation : Picos.Computation.packed =
   let c = Picos.Computation.create () in