13 files changed, 18 insertions, 20 deletions
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index c84cdea3..c3f960c7 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -30,7 +30,7 @@
 #include "being.h"
 #include "beingmanager.h"
 #include "game.h"
-#include "player_relations.h"
+#include "playerrelations.h"
 
 #include "gui/widgets/chattab.h"
 
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index b6eab2c7..65d19040 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -33,9 +33,9 @@
 #include "localplayer.h"
 #include "log.h"
 #include "npc.h"
-#include "player_relations.h"
+#include "playerrelations.h"
 
-#include "gui/npc_text.h"
+#include "gui/npctextdialog.h"
 
 #include <iostream>
 
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index fab1ffe3..c1d84265 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -33,7 +33,7 @@
 #include "main.h"
 
 #include "gui/charcreatedialog.h"
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 26af36dd..db89e316 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -30,7 +30,7 @@
 #include "beingmanager.h"
 #include "game.h"
 #include "localplayer.h"
-#include "player_relations.h"
+#include "playerrelations.h"
 
 #include "gui/widgets/chattab.h"
 
@@ -40,8 +40,6 @@
 
 #include <string>
 
-#define SERVER_NAME "Server"
-
 Net::ChatHandler *chatHandler;
 
 namespace EAthena {
@@ -96,7 +94,7 @@ void ChatHandler::handleMessage(MessageIn &msg)
 
             chatMsg = msg.readString(chatMsgLength);
 
-            if (nick != SERVER_NAME)
+            if (nick != "Server")
             {
                 if (player_relations.hasPermission(nick, PlayerRelation::WHISPER))
                     chatWindow->whisper(nick, chatMsg);
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 05313798..5c41c380 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -32,7 +32,7 @@
 #include "localplayer.h"
 #include "npc.h"
 
-#include "gui/npc_text.h"
+#include "gui/npctextdialog.h"
 #include "gui/npcintegerdialog.h"
 #include "gui/npclistdialog.h"
 #include "gui/npcstringdialog.h"
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 4ff480d6..ef6edc87 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -35,11 +35,11 @@
 #include "gui/buy.h"
 #include "gui/buysell.h"
 #include "gui/gui.h"
-#include "gui/npc_text.h"
+#include "gui/npctextdialog.h"
 #include "gui/npcintegerdialog.h"
 #include "gui/npclistdialog.h"
 #include "gui/npcstringdialog.h"
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 #include "gui/sell.h"
 #include "gui/skill.h"
 #include "gui/storagewindow.h"
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 1bf7e303..ee8e6733 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -29,9 +29,9 @@
 #include "inventory.h"
 #include "item.h"
 #include "localplayer.h"
-#include "player_relations.h"
+#include "playerrelations.h"
 
-#include "gui/confirm_dialog.h"
+#include "gui/confirmdialog.h"
 #include "gui/trade.h"
 
 #include "gui/widgets/chattab.h"
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 63a1ea3d..0998da04 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -23,7 +23,7 @@
 #define PLAYERHANDLER_H
 
 #include "being.h"
-#include "floor_item.h"
+#include "flooritem.h"
 #include "localplayer.h"
 
 namespace Net {
diff --git a/src/net/tmwserv/beinghandler.cpp b/src/net/tmwserv/beinghandler.cpp
index 581640db..1ec13800 100644
--- a/src/net/tmwserv/beinghandler.cpp
+++ b/src/net/tmwserv/beinghandler.cpp
@@ -35,7 +35,7 @@
 #include "particle.h"
 #include "sound.h"
 
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/net/tmwserv/charserverhandler.cpp b/src/net/tmwserv/charserverhandler.cpp
index 225c12a8..273c2d8f 100644
--- a/src/net/tmwserv/charserverhandler.cpp
+++ b/src/net/tmwserv/charserverhandler.cpp
@@ -36,7 +36,7 @@
 #include "main.h"
 
 #include "gui/charcreatedialog.h"
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/net/tmwserv/npchandler.cpp b/src/net/tmwserv/npchandler.cpp
index 5670bd69..20a13ec2 100644
--- a/src/net/tmwserv/npchandler.cpp
+++ b/src/net/tmwserv/npchandler.cpp
@@ -35,7 +35,7 @@
 
 #include "gui/npclistdialog.h"
 #include "gui/npcpostdialog.h"
-#include "gui/npc_text.h"
+#include "gui/npctextdialog.h"
 
 Net::NpcHandler *npcHandler;
 
diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp
index 441b5021..e2b5cec4 100644
--- a/src/net/tmwserv/playerhandler.cpp
+++ b/src/net/tmwserv/playerhandler.cpp
@@ -41,8 +41,8 @@
 #include "gui/chat.h"
 #include "gui/gui.h"
 #include "gui/npclistdialog.h"
-#include "gui/npc_text.h"
-#include "gui/ok_dialog.h"
+#include "gui/npctextdialog.h"
+#include "gui/okdialog.h"
 #include "gui/sell.h"
 #include "gui/skill.h"
 #include "gui/viewport.h"
diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp
index ae190c96..4c462a3f 100644
--- a/src/net/tmwserv/tradehandler.cpp
+++ b/src/net/tmwserv/tradehandler.cpp
@@ -35,7 +35,7 @@
 #include "item.h"
 #include "localplayer.h"
 
-#include "gui/confirm_dialog.h"
+#include "gui/confirmdialog.h"
 #include "gui/trade.h"
 
 #include "gui/widgets/chattab.h"