diff --git a/src/netcode/client_connection.c b/src/netcode/client_connection.c
index 1adc3a65ea2326d1d457a3b6dac15281521d60be..ff20a6fc74fb563d3814067e791919177133b2c7 100644
--- a/src/netcode/client_connection.c
+++ b/src/netcode/client_connection.c
@@ -1166,7 +1166,7 @@ void PT_ServerCFG(SINT8 node)
 
 	/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
 	///       Shouldn't them be downloaded even at intermission time?
-	///       Also, according to PT_Connect, the server will send the savegame even during intermission...
+	///       Also, according to PT_ClientJoin, the server will send the savegame even during intermission...
 	if (netbuffer->u.servercfg.gamestate == GS_LEVEL/* ||
 		netbuffer->u.servercfg.gamestate == GS_INTERMISSION*/)
 		cl_mode = CL_DOWNLOADSAVEGAME;
diff --git a/src/netcode/d_clisrv.c b/src/netcode/d_clisrv.c
index eef9bdfe5283804903334641abc569a061f5c736..7fc64b45615019fc2b1523ab8a8a097b3d04ed15 100644
--- a/src/netcode/d_clisrv.c
+++ b/src/netcode/d_clisrv.c
@@ -1350,7 +1350,7 @@ void SV_StartSinglePlayerServer(void)
   * \param node The packet sender (should be the server)
   *
   */
-static void PT_Shutdown(SINT8 node)
+static void PT_ServerShutdown(SINT8 node)
 {
 	(void)node;
 	LUA_HookBool(false, HOOK(GameQuit));
@@ -1365,7 +1365,7 @@ static void PT_Shutdown(SINT8 node)
   * \param node The packet sender (should be the server)
   *
   */
-static void PT_Timeout(SINT8 node)
+static void PT_NodeTimeout(SINT8 node)
 {
 	(void)node;
 	LUA_HookBool(false, HOOK(GameQuit));
diff --git a/src/netcode/server_connection.c b/src/netcode/server_connection.c
index f2b0306e64636425e8485c1c07a8ddc30169c2b6..3e7d46ef65a34c04447518895abf8066fe5295a3 100644
--- a/src/netcode/server_connection.c
+++ b/src/netcode/server_connection.c
@@ -422,7 +422,7 @@ GetRefuseMessage (SINT8 node, INT32 rejoinernum)
   * \param node The packet sender
   *
   */
-void PT_Connect(SINT8 node)
+void PT_ClientJoin(SINT8 node)
 {
 	char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME + 1];
 	INT32 numplayers = netbuffer->u.clientcfg.localplayers;
diff --git a/src/netcode/server_connection.h b/src/netcode/server_connection.h
index 585c9e428e788ddf9934e8ed104c35112df893da..96f7566baa5be4db27acd5a50870a0f099ba2fed 100644
--- a/src/netcode/server_connection.h
+++ b/src/netcode/server_connection.h
@@ -17,7 +17,7 @@
 #include "../doomdef.h"
 #include "../doomtype.h"
 
-void PT_Connect(SINT8 node);
+void PT_ClientJoin(SINT8 node);
 void PT_AskInfoViaMS(SINT8 node);
 void PT_TellFilesNeeded(SINT8 node);
 void PT_AskInfo(SINT8 node);