 (defmethod extensions/send-peer-site AeronConnection
   [messenger]
   {:channel (:channel messenger)
-   :send-stream-id (:send-stream-id messenger)})
+   :stream-id (:send-stream-id messenger)})
 
 (defmethod extensions/acker-peer-site AeronConnection
   [messenger]
   {:channel (:channel messenger)
-   :acker-stream-id (:acker-stream-id messenger)})
+   :stream-id (:acker-stream-id messenger)})
 
 (defmethod extensions/completion-peer-site AeronConnection
   [messenger]
   {:channel (:channel messenger)
-   :completion-stream-id (:completion-stream-id messenger)})
+   :stream-id (:completion-stream-id messenger)})
 
 (defmethod extensions/connect-to-peer AeronConnection
-  [messenger event {:keys [channel send-stream-id]}]
-  (let [ctx (Aeron$Context.)
+  [messenger event {:keys [channel stream-id]}]
+  (let [ctx (.errorHandler (Aeron$Context.) no-op-error-handler)
         aeron (Aeron/connect ctx)]
-    (.addPublication aeron channel send-stream-id)))
+    (.addPublication aeron channel stream-id)))
 
 (defmethod extensions/receive-messages AeronConnection
   [messenger {:keys [onyx.core/task-map] :as event}]

          daemon (:acking-daemon component)
          release-ch (chan (clojure.core.async/dropping-buffer 100000))

          port (+ 40000 (rand-int 250))
          channel (str "udp://localhost:" port)

          rand-stream-id (fn [] (rand-int 1000000))

          completion-stream-id (rand-stream-id)

          driver (MediaDriver/launch)
          ctx (.errorHandler (Aeron$Context.) no-op-error-handler)
          aeron (Aeron/connect ctx)

          send-handler (data-handler (partial handle-sent-message inbound-ch))
