                             ;; Microbenchmarks and common sense indicate that
                             ;; assoc is significantly faster than update
                             (assoc ::specs/contiguous-stream-count stop))))
-              (assoc ::log2/state log-state)))
+              (assoc ::log/state log-state)))
         (let [log-state
-              (log2/debug log-state
-                          ::consolidate-message-block
-                          "Dropping previously consolidated block")
+              (log/debug log-state
+                         ::consolidate-message-block
+                         "Dropping previously consolidated block")
               to-drop (val (first gap-buffer))
               log-state (if-not (keyword? to-drop)
                           (try
                             (.release to-drop)
                             log-state
                             (catch RuntimeException ex
-                              (log2/exception log-state
-                                              ex
-                                              "Failed to release"
-                                              to-drop)))
+                              (log/exception log-state
+                                             ex
+                                             "Failed to release"
+                                             to-drop)))
                           log-state)]
           (-> state
               (update-in [::specs/incoming ::specs/gap-buffer] pop-map-first)
-              (assoc ::log2/state log-state))))
+              (assoc ::log/state log-state))))
       ;; Gap starts past the end of the stream.
       (do
         (reduced state)))))

            [frereth-cp.message.constants :as K]
            [frereth-cp.message.helpers :as help]
            [frereth-cp.message.specs :as specs]
            ;; TODO: Refactor-rename this to log
            [frereth-cp.shared.logging :as log2]
            [frereth-cp.util :as utils]
            [manifold.deferred :as dfrd]
            [manifold.stream :as strm])

                      ;; (and how tough to reach one?)
                      triggered @(strm/put! parent-trigger
                                            {::result-writer succeeded
                                             ::log/state log-state
                                             ::specs/bs-or-eof bs})
                      log-state @succeeded
                      end-time (System/currentTimeMillis)
