diff --git a/libs/hbb_common b/libs/hbb_common
index 6ccb0d9..fdaa6c7 160000
--- a/libs/hbb_common
+++ b/libs/hbb_common
@@ -1 +1 @@
-Subproject commit 6ccb0d96e7bb37ea43df5c53e07983d6c07804e5
+Subproject commit fdaa6c740c475f6023c93a148bc851655d0093ac
diff --git a/src/hbbf/main.rs b/src/hbbf/main.rs
index 7759a1a..a9df3df 100644
--- a/src/hbbf/main.rs
+++ b/src/hbbf/main.rs
@@ -38,14 +38,14 @@ async fn make_pair(stream: FramedStream, addr: SocketAddr) -> ResultType<()> {
     let mut stream = stream;
     if let Some(Ok(bytes)) = stream.next_timeout(30_000).await {
         if let Ok(msg_in) = RendezvousMessage::parse_from_bytes(&bytes) {
-            if let Some(rendezvous_message::Union::request_forward(rf)) = msg_in.union {
+            if let Some(rendezvous_message::Union::request_relay(rf)) = msg_in.union {
                 if !rf.uuid.is_empty() {
                     let peer = PEERS.lock().unwrap().remove(&rf.uuid);
                     if let Some(peer) = peer {
                         log::info!("Forward request {} from {} got paired", rf.uuid, addr);
-                        return forward(stream, peer).await;
+                        return relay(stream, peer).await;
                     } else {
-                        log::info!("New forward request {} from {}", rf.uuid, addr);
+                        log::info!("New relay request {} from {}", rf.uuid, addr);
                         PEERS.lock().unwrap().insert(rf.uuid.clone(), stream);
                         sleep(30.).await;
                         PEERS.lock().unwrap().remove(&rf.uuid);
@@ -57,7 +57,7 @@ async fn make_pair(stream: FramedStream, addr: SocketAddr) -> ResultType<()> {
     Ok(())
 }
 
-async fn forward(stream: FramedStream, peer: FramedStream) -> ResultType<()> {
+async fn relay(stream: FramedStream, peer: FramedStream) -> ResultType<()> {
     let mut peer = peer;
     let mut stream = stream;
     peer.set_raw();
diff --git a/src/rendezvous_server.rs b/src/rendezvous_server.rs
index 1bf94ad..77df3df 100644
--- a/src/rendezvous_server.rs
+++ b/src/rendezvous_server.rs
@@ -157,17 +157,18 @@ impl RendezvousServer {
                                     Some(rendezvous_message::Union::punch_hole_request(ph)) => {
                                         allow_err!(rs.handle_tcp_punch_hole_request(addr, ph.id).await);
                                     }
-                                    Some(rendezvous_message::Union::request_forward(mut rf)) => {
+                                    Some(rendezvous_message::Union::request_relay(mut rf)) => {
                                         if !rs.pm.is_in_memory(&rf.id) {
                                             break;
                                         }
                                         let mut msg_out = RendezvousMessage::new();
                                         rf.socket_addr = AddrMangle::encode(addr);
-                                        msg_out.set_request_forward(rf);
+                                        msg_out.set_request_relay(rf);
                                         rs.tx.send((msg_out, addr)).ok();
                                     }
-                                    Some(rendezvous_message::Union::request_forward_response(rfr)) => {
+                                    Some(rendezvous_message::Union::request_relay_response(mut rfr)) => {
                                         let addr_b = AddrMangle::decode(&rfr.socket_addr);
+                                        rfr.socket_addr = Default::default();
                                         let sender_b= rs.tcp_punch.lock().unwrap().remove(&addr_b);
                                         if let Some(mut sender_b) = sender_b {
                                             if let Ok(bytes) = rfr.write_to_bytes() {
@@ -186,6 +187,8 @@ impl RendezvousServer {
                                     }
                                     _ => {}
                                 }
+                            } else {
+                                break;
                             }
                         }
                         rs.tcp_punch.lock().unwrap().remove(&addr);
@@ -252,10 +255,10 @@ impl RendezvousServer {
                         });
                     }
                 }
-                Some(rendezvous_message::Union::request_forward(rf)) => {
+                Some(rendezvous_message::Union::request_relay(rf)) => {
                     if self.pm.is_in_memory(&rf.id) {
                         let mut msg_out = RendezvousMessage::new();
-                        msg_out.set_request_forward(rf);
+                        msg_out.set_request_relay(rf);
                         socket.send(&msg_out, addr).await?
                     }
                 }
@@ -347,11 +350,11 @@ impl RendezvousServer {
             Some(peer) => peer.pk,
             _ => Vec::new(),
         };
-        let forward_server = phs.forward_server;
+        let relay_server = phs.relay_server;
         msg_out.set_punch_hole_response(PunchHoleResponse {
             socket_addr: AddrMangle::encode(addr),
             pk,
-            forward_server,
+            relay_server,
             ..Default::default()
         });
         if let Some(socket) = socket {
@@ -369,7 +372,7 @@ impl RendezvousServer {
         addr: SocketAddr,
         socket: Option<&'a mut FramedSocket>,
     ) -> ResultType<()> {
-        // forward local addrs of B to A
+        // relay local addrs of B to A
         let addr_a = AddrMangle::decode(&la.socket_addr);
         log::debug!(
             "{} local addrs response to {:?} from {:?}",
@@ -396,7 +399,7 @@ impl RendezvousServer {
         addr: SocketAddr,
         id: String,
     ) -> ResultType<(RendezvousMessage, Option<SocketAddr>)> {
-        // punch hole request from A, forward to B,
+        // punch hole request from A, relay to B,
         // check if in same intranet first,
         // fetch local addrs if in same intranet.
         // because punch hole won't work if in the same intranet,