                                    (crypto/box-prepare
                                     server-short
                                     (.getSecretKey my-short-pair)))
-                    log-state (log2/debug log-state
-                                          ::cookie->vouch
-                                          "Prepared shared short-term secret")]
+                    log-state (log/debug log-state
+                                         ::cookie->vouch
+                                         "Prepared shared short-term secret")]
                 (dfrd/success! notifier (assoc this
-                                               ::log2/state log-state
+                                               ::log/state log-state
                                                ::specs/network-packet cookie))))
-            (let [log-state (log2/warn log-state
-                                       ::received-response
-                                       "Unable to decrypt server cookie"
-                                       {::problem cookie})]
-              (dfrd/success! notifier (assoc this ::log2/state log-state))))
+            (let [log-state (log/warn log-state
+                                      ::received-response
+                                      "Unable to decrypt server cookie"
+                                      {::problem cookie})]
+              (dfrd/success! notifier (assoc this ::log/state log-state))))
           ;; TODO: Look into recovering from these
           (catch ExceptionInfo ex
-            (let [log-state (log2/exception log-state
-                                            ex
-                                            ::received-response
-                                            "High-level failure")
-                  log-state (log2/flush-logs! logger log-state)]
-              (dfrd/error! notifier (assoc this ::log2/state log-state))))
+            (let [log-state (log/exception log-state
+                                           ex
+                                           ::received-response
+                                           "High-level failure")
+                  log-state (log/flush-logs! logger log-state)]
+              (dfrd/error! notifier (assoc this ::log/state log-state))))
           (catch RuntimeException ex
-            (let [log-state (log2/exception log-state
-                                            ex
-                                            ::received-response
-                                            "Unexpected failure")
-                  log-state (log2/flush-logs! logger log-state)]
-              (dfrd/error! notifier (assoc this ::log2/state log-state))))
+            (let [log-state (log/exception log-state
+                                           ex
+                                           ::received-response
+                                           "Unexpected failure")
+                  log-state (log/flush-logs! logger log-state)]
+              (dfrd/error! notifier (assoc this ::log/state log-state))))
           (catch Exception ex
-            (let [log-state (log2/exception log-state
-                                            ex
-                                            ::received-response
-                                            "Low-level failure")
-                  log-state (log2/flush-logs! logger log-state)]
-              (dfrd/error! notifier (assoc this ::log2/state log-state))))
+            (let [log-state (log/exception log-state
+                                           ex
+                                           ::received-response
+                                           "Low-level failure")
+                  log-state (log/flush-logs! logger log-state)]
+              (dfrd/error! notifier (assoc this ::log/state log-state))))
           (catch Throwable ex
-            (let [log-state (log2/exception log-state
-                                            ex
-                                            ::received-response
-                                            "Serious Problem")
-                  log-state (log2/flush-logs! logger log-state)]
-              (dfrd/error! notifier (assoc this ::log2/state log-state)))))
-        (let [log-state (log2/warn log-state
-                                   ::received-response
-                                   "Invalid response. Just discard and retry"
-                                   {::problem cookie})]
-          (dfrd/success! notifier (assoc this ::log2/state log-state))))
-      (let [log-state (log2/warn log-state
-                                 ::received-response
-                                 "Server didn't respond to HELLO. Move on to next.")]
-        (dfrd/success! notifier (assoc this ::log2/state log-state))))))
+            (let [log-state (log/exception log-state
+                                           ex
+                                           ::received-response
+                                           "Serious Problem")
+                  log-state (log/flush-logs! logger log-state)]
+              (dfrd/error! notifier (assoc this ::log/state log-state)))))
+        (let [log-state (log/warn log-state
+                                  ::received-response
+                                  "Invalid response. Just discard and retry"
+                                  {::problem cookie})]
+          (dfrd/success! notifier (assoc this ::log/state log-state))))
+      (let [log-state (log/warn log-state
+                                ::received-response
+                                "Server didn't respond to HELLO. Move on to next.")]
+        (dfrd/success! notifier (assoc this ::log/state log-state))))))
 
 (defn hello-response-failed!
   [this failure]

  ;; If they don't match, we need to discard this cookie
  ;; and go back to waiting (don't forget to reduce the
  ;; timeout based on elapsed time)
  (let [log-state (log2/info log-state
                             ::received-response
                             "Possibly got a response from server"
                             cookie)]
    (if-not (or (= cookie ::drained)
                (= cookie ::hello-response-timed-out))
      (if (= K/cookie-packet-length (count message))

                                                                         ::state/server-extension
                                                                         ::state/server-security
                                                                         ::state/shared-secrets])
                                                           ::log/state log-state
                                                           ::shared/packet message))]
            (let [this (into this decrypted)
                  {:keys [::shared/my-keys]} this
                  server-short (get-in this
                                       [::state/server-security
                                        ::specs/public-short])
                  log-state (log/debug log-state
                                       ::cookie->vouch
                                       "Managed to decrypt the cookie")]
              (assert server-short (str "Missing ::specs/public-short among\n"
                                        (keys (::state/server-security this))
                                        "\namong bigger-picture\n"
