diff --git a/src/netcode/client_connection.c b/src/netcode/client_connection.c
index a00157a500cd78cfed962d3aba9d5f2c0c107d53..bed445a64461a3c7dfc5684ca8cfbefff036224a 100644
--- a/src/netcode/client_connection.c
+++ b/src/netcode/client_connection.c
@@ -1052,7 +1052,7 @@ void CL_ConnectToServer(void)
   * \note What happens if the packet comes from a client or something like that?
   *
   */
-void HandleServerInfo(SINT8 node)
+void PT_ServerInfo(SINT8 node)
 {
 	// compute ping in ms
 	const tic_t ticnow = I_GetTime();
@@ -1173,7 +1173,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 HandleConnect, the server will send the savegame even during intermission...
+	///       Also, according to PT_Connect, 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/client_connection.h b/src/netcode/client_connection.h
index a76411ba64775a4278cab173f6a69f738e69f024..74cff61fff518caf4d1a79776b4aa7ca94234cfd 100644
--- a/src/netcode/client_connection.h
+++ b/src/netcode/client_connection.h
@@ -53,7 +53,7 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room);
 void CL_ConnectToServer(void);
 boolean CL_SendJoin(void);
 
-void HandleServerInfo(SINT8 node);
+void PT_ServerInfo(SINT8 node);
 void PT_MoreFilesNeeded(SINT8 node);
 void PT_ServerRefuse(SINT8 node);
 void PT_ServerCFG(SINT8 node);
diff --git a/src/netcode/d_clisrv.c b/src/netcode/d_clisrv.c
index 0b1c487d86a4331f34951e030c05cd170e8d16b5..4589c83d3ee0b5e0f4bf86f6ceb53d57e7223560 100644
--- a/src/netcode/d_clisrv.c
+++ b/src/netcode/d_clisrv.c
@@ -1358,7 +1358,7 @@ void SV_StartSinglePlayerServer(void)
   * \param node The packet sender (should be the server)
   *
   */
-static void HandleShutdown(SINT8 node)
+static void PT_Shutdown(SINT8 node)
 {
 	(void)node;
 	LUA_HookBool(false, HOOK(GameQuit));
@@ -1373,7 +1373,7 @@ static void HandleShutdown(SINT8 node)
   * \param node The packet sender (should be the server)
   *
   */
-static void HandleTimeout(SINT8 node)
+static void PT_Timeout(SINT8 node)
 {
 	(void)node;
 	LUA_HookBool(false, HOOK(GameQuit));
@@ -1608,26 +1608,26 @@ void GetPackets(void)
 
 		if (netbuffer->packettype == PT_CLIENTJOIN && server)
 		{
-			HandleConnect(node);
+			PT_Connect(node);
 			continue;
 		}
 		if (node == servernode && client && cl_mode != CL_SEARCHING)
 		{
 			if (netbuffer->packettype == PT_SERVERSHUTDOWN)
 			{
-				HandleShutdown(node);
+				PT_Shutdown(node);
 				continue;
 			}
 			if (netbuffer->packettype == PT_NODETIMEOUT)
 			{
-				HandleTimeout(node);
+				PT_Timeout(node);
 				continue;
 			}
 		}
 
 		if (netbuffer->packettype == PT_SERVERINFO)
 		{
-			HandleServerInfo(node);
+			PT_ServerInfo(node);
 			continue;
 		}
 
diff --git a/src/netcode/server_connection.c b/src/netcode/server_connection.c
index ce1192475221c8a3d859f9031b12f4db26d7f230..e37c459510e172b5aee824ec80e61967a4f59f1d 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 HandleConnect(SINT8 node)
+void PT_Connect(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 a40bd4603f54911fb1c3b8b520d5970ac62cca4d..585c9e428e788ddf9934e8ed104c35112df893da 100644
--- a/src/netcode/server_connection.h
+++ b/src/netcode/server_connection.h
@@ -17,7 +17,7 @@
 #include "../doomdef.h"
 #include "../doomtype.h"
 
-void HandleConnect(SINT8 node);
+void PT_Connect(SINT8 node);
 void PT_AskInfoViaMS(SINT8 node);
 void PT_TellFilesNeeded(SINT8 node);
 void PT_AskInfo(SINT8 node);