7 files changed, 12 insertions, 12 deletions
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index a840f02f..45ded011 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_MANASERV_GENERALHANDLER_H
 #define NET_MANASERV_GENERALHANDLER_H
 
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "net/generalhandler.h"
 #include "net/net.h"
@@ -31,7 +31,7 @@
 
 namespace ManaServ {
 
-class GeneralHandler : public Net::GeneralHandler, public Listener
+class GeneralHandler : public Net::GeneralHandler, public EventListener
 {
     public:
         GeneralHandler();
diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index efa318ad..2733f3da 100644
--- a/src/net/manaserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -23,7 +23,7 @@
 #define NET_MANASERV_INVENTORYHANDLER_H
 
 #include "equipment.h"
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "net/inventoryhandler.h"
 
@@ -59,7 +59,7 @@ class EquipBackend : public Equipment::Backend
 };
 
 class InventoryHandler : public MessageHandler, Net::InventoryHandler,
-        public Listener
+        public EventListener
 {
     public:
         InventoryHandler();
diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h
index cb8fd67d..bda4de31 100644
--- a/src/net/manaserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_MANASERV_NPCHANDLER_H
 #define NET_MANASERV_NPCHANDLER_H
 
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "net/npchandler.h"
 
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index b24bd42b..a1a2e7ec 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_TA_MAPHANDLER_H
 #define NET_TA_MAPHANDLER_H
 
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "net/gamehandler.h"
 #include "net/net.h"
@@ -34,7 +34,7 @@
 namespace TmwAthena {
 
 class GameHandler : public MessageHandler, public Net::GameHandler,
-        public Listener
+        public EventListener
 {
     public:
         GameHandler();
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index a5f65e63..a4725b89 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_TMWA_GENERALHANDLER_H
 #define NET_TMWA_GENERALHANDLER_H
 
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "net/generalhandler.h"
 #include "net/net.h"
@@ -32,7 +32,7 @@
 namespace TmwAthena {
 
 class GeneralHandler : public MessageHandler, public Net::GeneralHandler,
-        public Listener
+        public EventListener
 {
     public:
         GeneralHandler();
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index afbdd7b4..783b225d 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -24,7 +24,7 @@
 
 #include "equipment.h"
 #include "inventory.h"
-#include "listener.h"
+#include "eventlistener.h"
 #include "playerinfo.h"
 
 #include "gui/inventorywindow.h"
@@ -119,7 +119,7 @@ class InventoryItem
 typedef std::list<InventoryItem> InventoryItems;
 
 class InventoryHandler : public MessageHandler, public Net::InventoryHandler,
-        public Listener
+        public EventListener
 {
     public:
         enum {
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 1e933418..7829924b 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_TA_NPCHANDLER_H
 #define NET_TA_NPCHANDLER_H
 
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "net/npchandler.h"