                                            ::server-cookie server-cookie)]
                 (assoc this
                        ::state/server-security server-security
-                       ::log2/state log-state))
+                       ::log/state log-state))
               (catch ExceptionInfo ex
                 (assoc this
-                       ::log2/state (log2/exception log-state
-                                                    ex
-                                                    ::decrypt-actual-cookie
-                                                    "Decryption failed"
-                                                    (.getData ex)))))))))))
+                       ::log/state (log/exception log-state
+                                                  ex
+                                                  ::decrypt-actual-cookie
+                                                  "Decryption failed"
+                                                  (.getData ex)))))))))))
 
 (defn decrypt-cookie-packet
   [{:keys [::shared/extension
            ::shared/packet
            ::state/server-extension]
-    log-state ::log2/state
+    log-state ::log/state
     :as this}]
   (when-not (= (count packet) K/cookie-packet-length)
     (let [err {::expected-length K/cookie-packet-length

           ::shared/work-area
           ::state/server-security
           ::state/shared-secrets]
    log-state ::log2/state
    :as this}
   {:keys [::K/header
           ::K/client-extension

    (do
      (send wrapper
            update
            ::log/state
            #(log/info %
                       ::wait-for-cookie!
                       "Sent to server"
                       sent))
      (let [chan<-server (::state/chan<-server @wrapper)
            d (strm/try-take! chan<-server
                                ::drained
