diff --git a/src/Makefile.am b/src/Makefile.am
index a22e492..2b58d81 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 bin_PROGRAMS = wmud
 AM_CPPFLAGS = -DWMUD_STATEDIR=\""$(localstatedir)"\" -DWMUD_CONFDIR=\""$(sysconfdir)"\" $(MEMCACHED_CFLAGS) $(GLIB_CFLAGS) $(GIO_CFLAGS) $(GTHREAD_CFLAGS) $(SQLITE3_CFLAGS)
 
-wmud_SOURCES = main.c networking.c interpreter.c db.c players.c maintenance.c
+wmud_SOURCES = main.c game-networking.c interpreter.c db.c players.c maintenance.c
 wmud_LDADD = $(MEMCACHED_LIBS) $(GLIB_LIBS) $(GIO_LIBS) $(GTHREAD_LIBS) $(SQLITE3_LIBS)
diff --git a/src/networking.c b/src/game-networking.c
similarity index 99%
rename from src/networking.c
rename to src/game-networking.c
index e3e8a50..a51c95d 100644
--- a/src/networking.c
+++ b/src/game-networking.c
@@ -1,7 +1,7 @@
 /* wMUD - Yet another MUD codebase by W00d5t0ck
  * Copyright (C) 2012 - Gergely POLONKAI
  *
- * networking.c: basic networking functions
+ * game-networking.c: basic networking functions
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include "main.h"
-#include "networking.h"
+#include "game-networking.h"
 #include "interpreter.h"
 #include "players.h"
 #include "db.h"
diff --git a/src/networking.h b/src/game-networking.h
similarity index 94%
rename from src/networking.h
rename to src/game-networking.h
index 663540e..342d2ff 100644
--- a/src/networking.h
+++ b/src/game-networking.h
@@ -1,7 +1,7 @@
 /* wMUD - Yet another MUD codebase by W00d5t0ck
  * Copyright (C) 2012 - Gergely POLONKAI
  *
- * networking.h: basic networking function headers, variables and defines
+ * game-networking.h: basic networking function headers, variables and defines
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/interpreter.c b/src/interpreter.c
index d2a2d22..77caef8 100644
--- a/src/interpreter.c
+++ b/src/interpreter.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "interpreter.h"
-#include "networking.h"
+#include "game-networking.h"
 #include "main.h"
 
 /**
diff --git a/src/interpreter.h b/src/interpreter.h
index e96147a..2f07ed0 100644
--- a/src/interpreter.h
+++ b/src/interpreter.h
@@ -19,7 +19,7 @@
 #ifndef __WMUD_INTERPRETER_H__
 # define __WMUD_INTERPRETER_H__
 
-#include "networking.h"
+#include "game-networking.h"
 
 /**
  * wmudCommandFunc:
diff --git a/src/main.c b/src/main.c
index 209eb62..f87aca3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,7 +28,7 @@
 
 #include "wmud_types.h"
 #include "main.h"
-#include "networking.h"
+#include "game-networking.h"
 #include "interpreter.h"
 #include "db.h"
 #include "players.h"
diff --git a/src/players.c b/src/players.c
index 8841abb..7aa54b8 100644
--- a/src/players.c
+++ b/src/players.c
@@ -25,7 +25,7 @@
 #include <crypt.h>
 #endif
 
-#include "networking.h"
+#include "game-networking.h"
 #include "players.h"
 
 /**