diff --git a/src/dorkbox/network/Server.kt b/src/dorkbox/network/Server.kt
index 5ed2a760..d3a706f0 100644
--- a/src/dorkbox/network/Server.kt
+++ b/src/dorkbox/network/Server.kt
@@ -200,13 +200,13 @@ open class Server<CONNECTION : Connection>(config: ServerConfiguration = ServerC
             val clientAddress = IPv4.toInt(clientAddressString)
 
             val message = readHandshakeMessage(buffer, offset, length, header)
-            handshake.processHandshakeMessageServer(this@Server,
-                                                    handshakePublication,
-                                                    sessionId,
-                                                    clientAddressString,
-                                                    clientAddress,
-                                                    message,
-                                                    aeron)
+            handshake.processUdpHandshakeMessageServer(this@Server,
+                                                       handshakePublication,
+                                                       sessionId,
+                                                       clientAddressString,
+                                                       clientAddress,
+                                                       message,
+                                                       aeron)
         }
 
         val ipcHandshakeHandler = FragmentAssembler { buffer: DirectBuffer, offset: Int, length: Int, header: Header ->
@@ -217,11 +217,11 @@ open class Server<CONNECTION : Connection>(config: ServerConfiguration = ServerC
             val sessionId = header.sessionId()
 
             val message = readHandshakeMessage(buffer, offset, length, header)
-            handshake.processHandshakeMessageServer(this@Server,
-                                                    ipcHandshakePublication,
-                                                    sessionId,
-                                                    message,
-                                                    aeron)
+            handshake.processIpcHandshakeMessageServer(this@Server,
+                                                       ipcHandshakePublication,
+                                                       sessionId,
+                                                       message,
+                                                       aeron)
         }
 
         actionDispatch.launch {
diff --git a/src/dorkbox/network/handshake/HandshakeMessage.kt b/src/dorkbox/network/handshake/HandshakeMessage.kt
index ffea1c8d..6452bd6e 100644
--- a/src/dorkbox/network/handshake/HandshakeMessage.kt
+++ b/src/dorkbox/network/handshake/HandshakeMessage.kt
@@ -122,6 +122,6 @@ internal class HandshakeMessage private constructor() {
         }
 
 
-        return "HandshakeMessage(oneTimePad=$oneTimePad, sid= $sessionId $stateStr$errorMsg)"
+        return "HandshakeMessage($sessionId : oneTimePad=$oneTimePad $stateStr$errorMsg)"
     }
 }
diff --git a/src/dorkbox/network/handshake/ServerHandshake.kt b/src/dorkbox/network/handshake/ServerHandshake.kt
index 84255e59..d97ac301 100644
--- a/src/dorkbox/network/handshake/ServerHandshake.kt
+++ b/src/dorkbox/network/handshake/ServerHandshake.kt
@@ -169,11 +169,11 @@ internal class ServerHandshake<CONNECTION : Connection>(private val logger: KLog
 
 
     // note: CANNOT be called in action dispatch
-    fun processHandshakeMessageServer(server: Server<CONNECTION>,
-                                      handshakePublication: Publication,
-                                      sessionId: Int,
-                                      message: Any?,
-                                      aeron: Aeron) {
+    fun processIpcHandshakeMessageServer(server: Server<CONNECTION>,
+                                         handshakePublication: Publication,
+                                         sessionId: Int,
+                                         message: Any?,
+                                         aeron: Aeron) {
 
         val connectionString = "IPC"
 
@@ -184,7 +184,6 @@ internal class ServerHandshake<CONNECTION : Connection>(private val logger: KLog
 
         val serialization = config.serialization
 
-
         /////
         /////
         ///// DONE WITH VALIDATION
@@ -322,13 +321,13 @@ internal class ServerHandshake<CONNECTION : Connection>(private val logger: KLog
     }
 
     // note: CANNOT be called in action dispatch
-    fun processHandshakeMessageServer(server: Server<CONNECTION>,
-                                      handshakePublication: Publication,
-                                      sessionId: Int,
-                                      clientAddressString: String,
-                                      clientAddress: Int,
-                                      message: Any?,
-                                      aeron: Aeron) {
+    fun processUdpHandshakeMessageServer(server: Server<CONNECTION>,
+                                         handshakePublication: Publication,
+                                         sessionId: Int,
+                                         clientAddressString: String,
+                                         clientAddress: Int,
+                                         message: Any?,
+                                         aeron: Aeron) {
 
         if (!validateMessageTypeAndDoPending(server, handshakePublication, message, sessionId, clientAddressString)) {
             return