68 files changed, 244 insertions, 244 deletions

diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index bef88094..89af9120 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -35,7 +35,7 @@ class LoginHandler
 {
     public:
         /**
-         * This enum describes options specific to either eAthena or tmwserv.
+         * This enum describes options specific to either eAthena or Manaserv.
          * By querying for these flags, the GUI can adapt to the current
          * server type dynamically.
          */
diff --git a/src/net/tmwserv/accountserver/account.cpp b/src/net/manaserv/accountserver/account.cpp
index e6c1830b..f34139da 100644
--- a/src/net/tmwserv/accountserver/account.cpp
+++ b/src/net/manaserv/accountserver/account.cpp
@@ -23,8 +23,8 @@
 
 #include "internal.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messageout.h"
 
diff --git a/src/net/tmwserv/accountserver/account.h b/src/net/manaserv/accountserver/account.h
index 03e83881..03e83881 100644
--- a/src/net/tmwserv/accountserver/account.h
+++ b/src/net/manaserv/accountserver/account.h
diff --git a/src/net/tmwserv/accountserver/accountserver.cpp b/src/net/manaserv/accountserver/accountserver.cpp
index 83895377..72f05aeb 100644
--- a/src/net/tmwserv/accountserver/accountserver.cpp
+++ b/src/net/manaserv/accountserver/accountserver.cpp
@@ -23,8 +23,8 @@
 
 #include "internal.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messageout.h"
 
diff --git a/src/net/tmwserv/accountserver/accountserver.h b/src/net/manaserv/accountserver/accountserver.h
index dd62fd25..dd62fd25 100644
--- a/src/net/tmwserv/accountserver/accountserver.h
+++ b/src/net/manaserv/accountserver/accountserver.h
diff --git a/src/net/tmwserv/accountserver/internal.cpp b/src/net/manaserv/accountserver/internal.cpp
index de1d412c..de1d412c 100644
--- a/src/net/tmwserv/accountserver/internal.cpp
+++ b/src/net/manaserv/accountserver/internal.cpp
diff --git a/src/net/tmwserv/accountserver/internal.h b/src/net/manaserv/accountserver/internal.h
index ff741872..ff741872 100644
--- a/src/net/tmwserv/accountserver/internal.h
+++ b/src/net/manaserv/accountserver/internal.h
diff --git a/src/net/tmwserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index e1e3b074..72ae01d0 100644
--- a/src/net/tmwserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/adminhandler.h"
+#include "net/manaserv/adminhandler.h"
 
-#include "net/tmwserv/chatserver/chatserver.h"
+#include "net/manaserv/chatserver/chatserver.h"
 
 Net::AdminHandler *adminHandler;
 
-namespace TmwServ {
+namespace ManaServ {
 
 AdminHandler::AdminHandler()
 {
@@ -82,4 +82,4 @@ void AdminHandler::mute(int playerId, int type, int limit)
     // TODO
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/adminhandler.h b/src/net/manaserv/adminhandler.h
index 0b83dfce..e26eb04a 100644
--- a/src/net/tmwserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_ADMINHANDLER_H
-#define NET_TMWSERV_ADMINHANDLER_H
+#ifndef NET_MANASERV_ADMINHANDLER_H
+#define NET_MANASERV_ADMINHANDLER_H
 
 #include "net/adminhandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class AdminHandler : public Net::AdminHandler
 {
@@ -52,6 +52,6 @@ class AdminHandler : public Net::AdminHandler
         void mute(int playerId, int type, int limit);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 2cf9274a..3df346a4 100644
--- a/src/net/tmwserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/beinghandler.h"
+#include "net/manaserv/beinghandler.h"
 
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messagein.h"
 
@@ -41,9 +41,9 @@
 
 #include "utils/gettext.h"
 
-#include "net/tmwserv/gameserver/player.h"
+#include "net/manaserv/gameserver/player.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 BeingHandler::BeingHandler()
 {
@@ -322,4 +322,4 @@ void BeingHandler::handleBeingDirChangeMessage(MessageIn &msg)
     }
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/beinghandler.h b/src/net/manaserv/beinghandler.h
index 77a329a2..4ece08e1 100644
--- a/src/net/tmwserv/beinghandler.h
+++ b/src/net/manaserv/beinghandler.h
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_BEINGHANDLER_H
-#define NET_TMWSERV_BEINGHANDLER_H
+#ifndef NET_MANASERV_BEINGHANDLER_H
+#define NET_MANASERV_BEINGHANDLER_H
 
 #include "net/messagehandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class BeingHandler : public MessageHandler
 {
@@ -44,6 +44,6 @@ class BeingHandler : public MessageHandler
         void handleBeingDirChangeMessage(MessageIn &msg);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp
index 87a583ec..f7dc91a4 100644
--- a/src/net/tmwserv/buysellhandler.cpp
+++ b/src/net/manaserv/buysellhandler.cpp
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/buysellhandler.h"
+#include "net/manaserv/buysellhandler.h"
 
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messagein.h"
 
@@ -38,7 +38,7 @@ extern BuyDialog *buyDialog;
 extern SellDialog *sellDialog;
 extern Window *buySellDialog;
 
-namespace TmwServ {
+namespace ManaServ {
 
 BuySellHandler::BuySellHandler()
 {
@@ -92,4 +92,4 @@ void BuySellHandler::handleMessage(MessageIn &msg)
     }
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/buysellhandler.h b/src/net/manaserv/buysellhandler.h
index 08f89015..9d31e739 100644
--- a/src/net/tmwserv/buysellhandler.h
+++ b/src/net/manaserv/buysellhandler.h
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_BUYSELLHANDLER_H
-#define NET_TMWSERV_BUYSELLHANDLER_H
+#ifndef NET_MANASERV_BUYSELLHANDLER_H
+#define NET_MANASERV_BUYSELLHANDLER_H
 
 #include "net/messagehandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class BuySellHandler : public MessageHandler
 {
@@ -34,6 +34,6 @@ class BuySellHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index 03a6dff0..a1b014fa 100644
--- a/src/net/tmwserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/charhandler.h"
+#include "net/manaserv/charhandler.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
-#include "net/tmwserv/accountserver/accountserver.h"
-#include "net/tmwserv/accountserver/account.h"
+#include "net/manaserv/accountserver/accountserver.h"
+#include "net/manaserv/accountserver/account.h"
 
 #include "net/logindata.h"
 #include "net/loginhandler.h"
@@ -65,7 +65,7 @@ struct CharInfo {
 typedef std::vector<CharInfo> CharInfos;
 CharInfos chars;
 
-namespace TmwServ {
+namespace ManaServ {
 
 extern std::string netToken;
 extern ServerInfo gameServer;
@@ -382,4 +382,4 @@ void CharHandler::deleteCharacter(int slot, LocalPlayer* character)
     Net::AccountServer::Account::deleteCharacter(slot);
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/charhandler.h b/src/net/manaserv/charhandler.h
index 03ea51dc..dafe6431 100644
--- a/src/net/tmwserv/charhandler.h
+++ b/src/net/manaserv/charhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_CHARSERVERHANDLER_H
-#define NET_TMWSERV_CHARSERVERHANDLER_H
+#ifndef NET_MANASERV_CHARSERVERHANDLER_H
+#define NET_MANASERV_CHARSERVERHANDLER_H
 
 #include "net/charhandler.h"
 
@@ -30,7 +30,7 @@
 
 class LoginData;
 
-namespace TmwServ {
+namespace ManaServ {
 
 /**
  * Deals with incoming messages related to character selection.
@@ -76,6 +76,6 @@ class CharHandler : public MessageHandler, public Net::CharHandler
         CharCreateDialog *mCharCreateDialog;
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 229f09be..5b85ed53 100644
--- a/src/net/tmwserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -19,16 +19,16 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/chathandler.h"
+#include "net/manaserv/chathandler.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
-#include "net/tmwserv/chatserver/chatserver.h"
-#include "net/tmwserv/chatserver/internal.h"
+#include "net/manaserv/chatserver/chatserver.h"
+#include "net/manaserv/chatserver/internal.h"
 
-#include "net/tmwserv/gameserver/internal.h"
-#include "net/tmwserv/gameserver/player.h"
+#include "net/manaserv/gameserver/internal.h"
+#include "net/manaserv/gameserver/player.h"
 
 #include "net/messagein.h"
 #include "net/messageout.h"
@@ -56,7 +56,7 @@ Net::ChatHandler *chatHandler;
 
 extern Net::Connection *chatServerConnection;
 
-namespace TmwServ {
+namespace ManaServ {
 
 extern std::string netToken;
 extern ServerInfo chatServer;
@@ -456,4 +456,4 @@ void ChatHandler::who()
     Net::ChatServer::connection->send(msg);
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/chathandler.h b/src/net/manaserv/chathandler.h
index 85bc2054..2f6a8d00 100644
--- a/src/net/tmwserv/chathandler.h
+++ b/src/net/manaserv/chathandler.h
@@ -19,15 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_CHATHANDLER_H
-#define NET_TMWSERV_CHATHANDLER_H
+#ifndef NET_MANASERV_CHATHANDLER_H
+#define NET_MANASERV_CHATHANDLER_H
 
 #include "net/chathandler.h"
 #include "net/messagehandler.h"
 
 #include "net/serverinfo.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class ChatHandler : public MessageHandler, public Net::ChatHandler
 {
@@ -123,6 +123,6 @@ class ChatHandler : public MessageHandler, public Net::ChatHandler
         void handleWhoResponse(MessageIn &msg);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/chatserver/chatserver.cpp b/src/net/manaserv/chatserver/chatserver.cpp
index c35fc782..f0f5faf2 100644
--- a/src/net/tmwserv/chatserver/chatserver.cpp
+++ b/src/net/manaserv/chatserver/chatserver.cpp
@@ -23,8 +23,8 @@
 
 #include "internal.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messageout.h"
 
diff --git a/src/net/tmwserv/chatserver/chatserver.h b/src/net/manaserv/chatserver/chatserver.h
index 18859a2c..18859a2c 100644
--- a/src/net/tmwserv/chatserver/chatserver.h
+++ b/src/net/manaserv/chatserver/chatserver.h
diff --git a/src/net/tmwserv/chatserver/guild.cpp b/src/net/manaserv/chatserver/guild.cpp
index 740e9efa..5973077e 100644
--- a/src/net/tmwserv/chatserver/guild.cpp
+++ b/src/net/manaserv/chatserver/guild.cpp
@@ -23,8 +23,8 @@
 
 #include "internal.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messageout.h"
 
diff --git a/src/net/tmwserv/chatserver/guild.h b/src/net/manaserv/chatserver/guild.h
index 2e9cf9a6..2e9cf9a6 100644
--- a/src/net/tmwserv/chatserver/guild.h
+++ b/src/net/manaserv/chatserver/guild.h
diff --git a/src/net/tmwserv/chatserver/internal.cpp b/src/net/manaserv/chatserver/internal.cpp
index 52744804..52744804 100644
--- a/src/net/tmwserv/chatserver/internal.cpp
+++ b/src/net/manaserv/chatserver/internal.cpp
diff --git a/src/net/tmwserv/chatserver/internal.h b/src/net/manaserv/chatserver/internal.h
index 162d54fb..162d54fb 100644
--- a/src/net/tmwserv/chatserver/internal.h
+++ b/src/net/manaserv/chatserver/internal.h
diff --git a/src/net/tmwserv/chatserver/party.cpp b/src/net/manaserv/chatserver/party.cpp
index 272bcbd7..26b45346 100644
--- a/src/net/tmwserv/chatserver/party.cpp
+++ b/src/net/manaserv/chatserver/party.cpp
@@ -23,8 +23,8 @@
 
 #include "internal.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messageout.h"
 
diff --git a/src/net/tmwserv/chatserver/party.h b/src/net/manaserv/chatserver/party.h
index 3850c283..3850c283 100644
--- a/src/net/tmwserv/chatserver/party.h
+++ b/src/net/manaserv/chatserver/party.h
diff --git a/src/net/tmwserv/connection.cpp b/src/net/manaserv/connection.cpp
index 9346e3cc..b73f867f 100644
--- a/src/net/tmwserv/connection.cpp
+++ b/src/net/manaserv/connection.cpp
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/connection.h"
+#include "net/manaserv/connection.h"
 
-#include "net/tmwserv/internal.h"
+#include "net/manaserv/internal.h"
 
 #include "net/messageout.h"
 
diff --git a/src/net/tmwserv/connection.h b/src/net/manaserv/connection.h
index 8d1c2924..b340546b 100644
--- a/src/net/tmwserv/connection.h
+++ b/src/net/manaserv/connection.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_CONNECTION_H
-#define NET_TMWSERV_CONNECTION_H
+#ifndef NET_MANASERV_CONNECTION_H
+#define NET_MANASERV_CONNECTION_H
 
 #include <iosfwd>
 
diff --git a/src/net/tmwserv/effecthandler.cpp b/src/net/manaserv/effecthandler.cpp
index a9960936..e2121102 100644
--- a/src/net/tmwserv/effecthandler.cpp
+++ b/src/net/manaserv/effecthandler.cpp
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/effecthandler.h"
+#include "net/manaserv/effecthandler.h"
 
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messagein.h"
 
@@ -29,7 +29,7 @@
 #include "effectmanager.h"
 #include "log.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 EffectHandler::EffectHandler()
 {
@@ -77,4 +77,4 @@ void EffectHandler::handleCreateEffectBeing(MessageIn &msg)
      }
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/effecthandler.h b/src/net/manaserv/effecthandler.h
index b15b9b0a..5c52f121 100644
--- a/src/net/tmwserv/effecthandler.h
+++ b/src/net/manaserv/effecthandler.h
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_EFFECTSHANDLER_H
-#define NET_TMWSERV_EFFECTSHANDLER_H
+#ifndef NET_MANASERV_EFFECTSHANDLER_H
+#define NET_MANASERV_EFFECTSHANDLER_H
 
 #include "net/messagehandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class EffectHandler : public MessageHandler
 {
@@ -38,6 +38,6 @@ class EffectHandler : public MessageHandler
         void handleCreateEffectBeing(MessageIn &msg);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index ec2f33c4..2a4e08b6 100644
--- a/src/net/tmwserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -19,24 +19,24 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/gamehandler.h"
+#include "net/manaserv/gamehandler.h"
 
-#include "net/tmwserv/chathandler.h"
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/chathandler.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
-#include "net/tmwserv/chatserver/chatserver.h"
-#include "net/tmwserv/gameserver/gameserver.h"
+#include "net/manaserv/chatserver/chatserver.h"
+#include "net/manaserv/gameserver/gameserver.h"
 
 #include "main.h"
 
 Net::GameHandler *gameHandler;
 
-extern TmwServ::ChatHandler *chatHandler;
+extern ManaServ::ChatHandler *chatHandler;
 
 extern Net::Connection *gameServerConnection;
 
-namespace TmwServ {
+namespace ManaServ {
 
 extern std::string netToken;
 extern ServerInfo gameServer;
@@ -129,4 +129,4 @@ void GameHandler::clear()
     disconnect();
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index 4721d634..846eb2ae 100644
--- a/src/net/tmwserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -19,15 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_MAPHANDLER_H
-#define NET_TMWSERV_MAPHANDLER_H
+#ifndef NET_MANASERV_MAPHANDLER_H
+#define NET_MANASERV_MAPHANDLER_H
 
 #include "net/gamehandler.h"
 #include "net/messagehandler.h"
 
 #include "net/serverinfo.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class GameHandler : public MessageHandler, public Net::GameHandler
 {
@@ -55,6 +55,6 @@ class GameHandler : public MessageHandler, public Net::GameHandler
         void clear();
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/gameserver/gameserver.cpp b/src/net/manaserv/gameserver/gameserver.cpp
index e70c4d19..94015c20 100644
--- a/src/net/tmwserv/gameserver/gameserver.cpp
+++ b/src/net/manaserv/gameserver/gameserver.cpp
@@ -23,8 +23,8 @@
 
 #include "internal.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messageout.h"
 
diff --git a/src/net/tmwserv/gameserver/gameserver.h b/src/net/manaserv/gameserver/gameserver.h
index 6de82c2e..6de82c2e 100644
--- a/src/net/tmwserv/gameserver/gameserver.h
+++ b/src/net/manaserv/gameserver/gameserver.h
diff --git a/src/net/tmwserv/gameserver/internal.cpp b/src/net/manaserv/gameserver/internal.cpp
index 27cb4a47..27cb4a47 100644
--- a/src/net/tmwserv/gameserver/internal.cpp
+++ b/src/net/manaserv/gameserver/internal.cpp
diff --git a/src/net/tmwserv/gameserver/internal.h b/src/net/manaserv/gameserver/internal.h
index 6c6e2613..6c6e2613 100644
--- a/src/net/tmwserv/gameserver/internal.h
+++ b/src/net/manaserv/gameserver/internal.h
diff --git a/src/net/tmwserv/gameserver/player.cpp b/src/net/manaserv/gameserver/player.cpp
index 4e63930b..e667c8b9 100644
--- a/src/net/tmwserv/gameserver/player.cpp
+++ b/src/net/manaserv/gameserver/player.cpp
@@ -23,8 +23,8 @@
 
 #include "internal.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messageout.h"
 
diff --git a/src/net/tmwserv/gameserver/player.h b/src/net/manaserv/gameserver/player.h
index 9a202c6e..9a202c6e 100644
--- a/src/net/tmwserv/gameserver/player.h
+++ b/src/net/manaserv/gameserver/player.h
diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index c749e10a..0b2eefe2 100644
--- a/src/net/tmwserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/generalhandler.h"
+#include "net/manaserv/generalhandler.h"
 
 #include "gui/changeemaildialog.h"
 #include "gui/charselectdialog.h"
@@ -30,24 +30,24 @@
 #include "gui/specialswindow.h"
 #include "gui/statuswindow.h"
 
-#include "net/tmwserv/network.h"
-#include "net/tmwserv/connection.h"
-
-#include "net/tmwserv/beinghandler.h"
-#include "net/tmwserv/buysellhandler.h"
-#include "net/tmwserv/charhandler.h"
-#include "net/tmwserv/chathandler.h"
-#include "net/tmwserv/effecthandler.h"
-#include "net/tmwserv/gamehandler.h"
-#include "net/tmwserv/guildhandler.h"
-#include "net/tmwserv/inventoryhandler.h"
-#include "net/tmwserv/itemhandler.h"
-#include "net/tmwserv/loginhandler.h"
-#include "net/tmwserv/npchandler.h"
-#include "net/tmwserv/partyhandler.h"
-#include "net/tmwserv/playerhandler.h"
-#include "net/tmwserv/specialhandler.h"
-#include "net/tmwserv/tradehandler.h"
+#include "net/manaserv/network.h"
+#include "net/manaserv/connection.h"
+
+#include "net/manaserv/beinghandler.h"
+#include "net/manaserv/buysellhandler.h"
+#include "net/manaserv/charhandler.h"
+#include "net/manaserv/chathandler.h"
+#include "net/manaserv/effecthandler.h"
+#include "net/manaserv/gamehandler.h"
+#include "net/manaserv/guildhandler.h"
+#include "net/manaserv/inventoryhandler.h"
+#include "net/manaserv/itemhandler.h"
+#include "net/manaserv/loginhandler.h"
+#include "net/manaserv/npchandler.h"
+#include "net/manaserv/partyhandler.h"
+#include "net/manaserv/playerhandler.h"
+#include "net/manaserv/specialhandler.h"
+#include "net/manaserv/tradehandler.h"
 
 #include "utils/gettext.h"
 
@@ -61,7 +61,7 @@ Net::Connection *gameServerConnection = 0;
 Net::Connection *chatServerConnection = 0;
 Net::Connection *accountServerConnection = 0;
 
-namespace TmwServ {
+namespace ManaServ {
 
 std::string netToken = "";
 ServerInfo gameServer;
@@ -187,4 +187,4 @@ void GeneralHandler::clearHandlers()
     Net::clearHandlers();
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index ef533489..0017af75 100644
--- a/src/net/tmwserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -19,14 +19,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_GENERALHANDLER_H
-#define NET_TMWSERV_GENERALHANDLER_H
+#ifndef NET_MANASERV_GENERALHANDLER_H
+#define NET_MANASERV_GENERALHANDLER_H
 
 #include "net/generalhandler.h"
 #include "net/net.h"
 #include "net/messagehandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class GeneralHandler : public Net::GeneralHandler
 {
@@ -69,6 +69,6 @@ class GeneralHandler : public Net::GeneralHandler
         MessageHandlerPtr mSpecialHandler;
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
-#endif // NET_TMWSERV_GENERALHANDLER_H
+#endif // NET_MANASERV_GENERALHANDLER_H
diff --git a/src/net/tmwserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index 8d078740..876de413 100644
--- a/src/net/tmwserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/guildhandler.h"
+#include "net/manaserv/guildhandler.h"
 
 #include "net/messagein.h"
 
-#include "net/tmwserv/chatserver/chatserver.h"
-#include "net/tmwserv/chatserver/guild.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/chatserver/chatserver.h"
+#include "net/manaserv/chatserver/guild.h"
+#include "net/manaserv/protocol.h"
 
 #include "gui/widgets/channeltab.h"
 #include "gui/chat.h"
@@ -42,7 +42,7 @@
 
 #include <iostream>
 
-namespace TmwServ {
+namespace ManaServ {
 
 GuildHandler::GuildHandler()
 {
@@ -251,4 +251,4 @@ void GuildHandler::joinedGuild(MessageIn &msg)
                                BY_CHANNEL);
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 2178a19e..d1b57e50 100644
--- a/src/net/tmwserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -19,14 +19,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_GUILDHANDLER_H
-#define NET_TMWSERV_GUILDHANDLER_H
+#ifndef NET_MANASERV_GUILDHANDLER_H
+#define NET_MANASERV_GUILDHANDLER_H
 
 #include "net/messagehandler.h"
 
 #include <string>
 
-namespace TmwServ {
+namespace ManaServ {
 
 class GuildHandler : public MessageHandler
 {
@@ -39,6 +39,6 @@ protected:
     void joinedGuild(MessageIn &msg);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/internal.cpp b/src/net/manaserv/internal.cpp
index 253d4f5f..055ce7f2 100644
--- a/src/net/tmwserv/internal.cpp
+++ b/src/net/manaserv/internal.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/internal.h"
+#include "net/manaserv/internal.h"
 
 namespace Net
 {
diff --git a/src/net/tmwserv/internal.h b/src/net/manaserv/internal.h
index 17ee9081..582e4c17 100644
--- a/src/net/tmwserv/internal.h
+++ b/src/net/manaserv/internal.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_INTERNAL_H
-#define NET_TMWSERV_INTERNAL_H
+#ifndef NET_MANASERV_INTERNAL_H
+#define NET_MANASERV_INTERNAL_H
 
 namespace Net
 {
diff --git a/src/net/tmwserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 6993167c..6074c8d7 100644
--- a/src/net/tmwserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/inventoryhandler.h"
+#include "net/manaserv/inventoryhandler.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
-#include "net/tmwserv/gameserver/internal.h"
-#include "net/tmwserv/gameserver/player.h"
+#include "net/manaserv/gameserver/internal.h"
+#include "net/manaserv/gameserver/player.h"
 
 #include "net/messagein.h"
 #include "net/messageout.h"
@@ -44,7 +44,7 @@
 
 Net::InventoryHandler *inventoryHandler;
 
-namespace TmwServ {
+namespace ManaServ {
 
 InventoryHandler::InventoryHandler()
 {
@@ -164,4 +164,4 @@ void InventoryHandler::moveItem(StorageType source, int slot, int amount,
     // TODO
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index 9ae37c10..b6510d6a 100644
--- a/src/net/tmwserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_INVENTORYHANDLER_H
-#define NET_TMWSERV_INVENTORYHANDLER_H
+#ifndef NET_MANASERV_INVENTORYHANDLER_H
+#define NET_MANASERV_INVENTORYHANDLER_H
 
 #include "net/inventoryhandler.h"
 #include "net/messagehandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class InventoryHandler : public MessageHandler, Net::InventoryHandler
 {
@@ -56,6 +56,6 @@ class InventoryHandler : public MessageHandler, Net::InventoryHandler
                               StorageType destination);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index 423ce192..6f25d7df 100644
--- a/src/net/tmwserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -19,16 +19,16 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/itemhandler.h"
+#include "net/manaserv/itemhandler.h"
 
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messagein.h"
 
 #include "engine.h"
 #include "flooritemmanager.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 ItemHandler::ItemHandler()
 {
@@ -67,4 +67,4 @@ void ItemHandler::handleMessage(MessageIn &msg)
     }
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/itemhandler.h b/src/net/manaserv/itemhandler.h
index d1d24d43..fde3000d 100644
--- a/src/net/tmwserv/itemhandler.h
+++ b/src/net/manaserv/itemhandler.h
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_ITEMHANDLER_H
-#define NET_TMWSERV_ITEMHANDLER_H
+#ifndef NET_MANASERV_ITEMHANDLER_H
+#define NET_MANASERV_ITEMHANDLER_H
 
 #include "net/messagehandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class ItemHandler : public MessageHandler
 {
@@ -34,6 +34,6 @@ class ItemHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index 5035a4db..8ae63ce9 100644
--- a/src/net/tmwserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/loginhandler.h"
+#include "net/manaserv/loginhandler.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
-#include "net/tmwserv/accountserver/account.h"
-#include "net/tmwserv/accountserver/accountserver.h"
+#include "net/manaserv/accountserver/account.h"
+#include "net/manaserv/accountserver/accountserver.h"
 
 #include "net/logindata.h"
 #include "net/messagein.h"
@@ -38,7 +38,7 @@ Net::LoginHandler *loginHandler;
 
 extern Net::Connection *accountServerConnection;
 
-namespace TmwServ {
+namespace ManaServ {
 
 LoginHandler::LoginHandler()
 {
@@ -356,4 +356,4 @@ Worlds LoginHandler::getWorlds() const
     return Worlds();
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/loginhandler.h b/src/net/manaserv/loginhandler.h
index ae1e7bfb..f5013fc2 100644
--- a/src/net/tmwserv/loginhandler.h
+++ b/src/net/manaserv/loginhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_LOGINHANDLER_H
-#define NET_TMWSERV_LOGINHANDLER_H
+#ifndef NET_MANASERV_LOGINHANDLER_H
+#define NET_MANASERV_LOGINHANDLER_H
 
 #include "net/loginhandler.h"
 #include "net/messagehandler.h"
@@ -29,7 +29,7 @@
 
 class LoginData;
 
-namespace TmwServ {
+namespace ManaServ {
 
 class LoginHandler : public MessageHandler, public Net::LoginHandler
 {
@@ -79,6 +79,6 @@ class LoginHandler : public MessageHandler, public Net::LoginHandler
         LoginData *mLoginData;
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
-#endif // NET_TMWSERV_LOGINHANDLER_H
+#endif // NET_MANASERV_LOGINHANDLER_H
diff --git a/src/net/tmwserv/network.cpp b/src/net/manaserv/network.cpp
index d353da17..84b9d070 100644
--- a/src/net/tmwserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/network.h"
+#include "net/manaserv/network.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/internal.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/internal.h"
 
 #include "net/messagehandler.h"
 #include "net/messagein.h"
diff --git a/src/net/tmwserv/network.h b/src/net/manaserv/network.h
index 1b5c7bc6..8b7cedd8 100644
--- a/src/net/tmwserv/network.h
+++ b/src/net/manaserv/network.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_NETWORK_H
-#define NET_TMWSERV_NETWORK_H
+#ifndef NET_MANASERV_NETWORK_H
+#define NET_MANASERV_NETWORK_H
 
 #include <iosfwd>
 
diff --git a/src/net/tmwserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index f0379ade..2f1a8e4a 100644
--- a/src/net/tmwserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/npchandler.h"
+#include "net/manaserv/npchandler.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
-#include "net/tmwserv/gameserver/internal.h"
-#include "net/tmwserv/gameserver/player.h"
+#include "net/manaserv/gameserver/internal.h"
+#include "net/manaserv/gameserver/player.h"
 
 #include "net/messagein.h"
 #include "net/messageout.h"
@@ -38,7 +38,7 @@
 
 Net::NpcHandler *npcHandler;
 
-namespace TmwServ {
+namespace ManaServ {
 
 NpcHandler::NpcHandler()
 {
@@ -203,4 +203,4 @@ void NpcHandler::endShopping(int beingId)
     // TODO
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/npchandler.h b/src/net/manaserv/npchandler.h
index 2bf953c0..bc0aaee1 100644
--- a/src/net/tmwserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -19,15 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_NPCHANDLER_H
-#define NET_TMWSERV_NPCHANDLER_H
+#ifndef NET_MANASERV_NPCHANDLER_H
+#define NET_MANASERV_NPCHANDLER_H
 
 #include "net/messagehandler.h"
 #include "net/npchandler.h"
 
 #include <list>
 
-namespace TmwServ {
+namespace ManaServ {
 
 class NpcHandler : public MessageHandler, public Net::NpcHandler
 {
@@ -64,6 +64,6 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
         void endShopping(int beingId);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index 220d20c0..9f20f027 100644
--- a/src/net/tmwserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/partyhandler.h"
+#include "net/manaserv/partyhandler.h"
 
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/protocol.h"
 
-#include "net/tmwserv/chatserver/chatserver.h"
-#include "net/tmwserv/chatserver/party.h"
+#include "net/manaserv/chatserver/chatserver.h"
+#include "net/manaserv/chatserver/party.h"
 
 #include "net/messagein.h"
 
@@ -42,7 +42,7 @@
 
 Net::PartyHandler *partyHandler;
 
-namespace TmwServ {
+namespace ManaServ {
 
 PartyHandler::PartyHandler()
 {
@@ -176,4 +176,4 @@ void PartyHandler::requestPartyMembers()
     // TODO
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/partyhandler.h b/src/net/manaserv/partyhandler.h
index aa899166..c44f7ace 100644
--- a/src/net/tmwserv/partyhandler.h
+++ b/src/net/manaserv/partyhandler.h
@@ -19,15 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_PARTYHANDLER_H
-#define NET_TMWSERV_PARTYHANDLER_H
+#ifndef NET_MANASERV_PARTYHANDLER_H
+#define NET_MANASERV_PARTYHANDLER_H
 
 #include "net/messagehandler.h"
 #include "net/partyhandler.h"
 
 #include <string>
 
-namespace TmwServ {
+namespace ManaServ {
 
 class PartyHandler : public MessageHandler, public Net::PartyHandler
 {
@@ -65,7 +65,7 @@ public:
     void setShareItems(PartyShare share) {}
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
 
diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index bbb5a203..91ff6a1c 100644
--- a/src/net/tmwserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/playerhandler.h"
+#include "net/manaserv/playerhandler.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
-#include "net/tmwserv/gameserver/internal.h"
-#include "net/tmwserv/gameserver/player.h"
+#include "net/manaserv/gameserver/internal.h"
+#include "net/manaserv/gameserver/player.h"
 
 #include "net/messagein.h"
 #include "net/messageout.h"
@@ -92,7 +92,7 @@ namespace {
 
 Net::PlayerHandler *playerHandler;
 
-namespace TmwServ {
+namespace ManaServ {
 
 PlayerHandler::PlayerHandler()
 {
@@ -408,4 +408,4 @@ bool PlayerHandler::canUseMagic()
     return true;
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/playerhandler.h b/src/net/manaserv/playerhandler.h
index 287baa3d..1dd600c8 100644
--- a/src/net/tmwserv/playerhandler.h
+++ b/src/net/manaserv/playerhandler.h
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_PLAYERHANDLER_H
-#define NET_TMWSERV_PLAYERHANDLER_H
+#ifndef NET_MANASERV_PLAYERHANDLER_H
+#define NET_MANASERV_PLAYERHANDLER_H
 
 #include "net/messagehandler.h"
 #include "net/playerhandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class PlayerHandler : public MessageHandler, public Net::PlayerHandler
 {
@@ -64,6 +64,6 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler
         void handleMapChangeMessage(MessageIn &msg);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/protocol.h b/src/net/manaserv/protocol.h
index 50b20216..d1ff3f73 100644
--- a/src/net/tmwserv/protocol.h
+++ b/src/net/manaserv/protocol.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TMWSERV_PROTOCOL_H
-#define TMWSERV_PROTOCOL_H
+#ifndef MANASERV_PROTOCOL_H
+#define MANASERV_PROTOCOL_H
 
 /**
  * Enumerated type for communicated messages:
@@ -310,4 +310,4 @@ enum {
     GUILD_EVENT_OFFLINE_PLAYER
 };
 
-#endif
+#endif // MANASERV_PROTOCOL_H
diff --git a/src/net/tmwserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp
index 2e4ff1bb..55ea3ee0 100644
--- a/src/net/tmwserv/specialhandler.cpp
+++ b/src/net/manaserv/specialhandler.cpp
@@ -19,18 +19,18 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/specialhandler.h"
+#include "net/manaserv/specialhandler.h"
 
-#include "net/tmwserv/gameserver/internal.h"
+#include "net/manaserv/gameserver/internal.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messageout.h"
 
 Net::SpecialHandler *specialHandler;
 
-namespace TmwServ {
+namespace ManaServ {
 
 SpecialHandler::SpecialHandler()
 {
@@ -64,4 +64,4 @@ void SpecialHandler::use(int id, const std::string &map)
     // TODO
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/specialhandler.h b/src/net/manaserv/specialhandler.h
index b8f0ce90..3f61bf4b 100644
--- a/src/net/tmwserv/specialhandler.h
+++ b/src/net/manaserv/specialhandler.h
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_SKILLHANDLER_H
-#define NET_TMWSERV_SKILLHANDLER_H
+#ifndef NET_MANASERV_SKILLHANDLER_H
+#define NET_MANASERV_SKILLHANDLER_H
 
 #include "net/messagehandler.h"
 #include "net/specialhandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class SpecialHandler : public MessageHandler, public Net::SpecialHandler
 {
@@ -43,6 +43,6 @@ class SpecialHandler : public MessageHandler, public Net::SpecialHandler
         void use(int id, const std::string &map);
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index 55a00d4c..aa2f9ab5 100644
--- a/src/net/tmwserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "net/tmwserv/tradehandler.h"
+#include "net/manaserv/tradehandler.h"
 
-#include "net/tmwserv/gameserver/internal.h"
-#include "net/tmwserv/gameserver/player.h"
+#include "net/manaserv/gameserver/internal.h"
+#include "net/manaserv/gameserver/player.h"
 
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/protocol.h"
 
 #include "net/messagein.h"
 #include "net/messageout.h"
@@ -68,7 +68,7 @@ namespace {
 
 Net::TradeHandler *tradeHandler;
 
-namespace TmwServ {
+namespace ManaServ {
 
 TradeHandler::TradeHandler():
     mAcceptTradeRequests(true)
@@ -223,4 +223,4 @@ void TradeHandler::cancel()
     Net::GameServer::connection->send(msg);
 }
 
-} // namespace TmwServ
+} // namespace ManaServ
diff --git a/src/net/tmwserv/tradehandler.h b/src/net/manaserv/tradehandler.h
index dc9e070a..9041952d 100644
--- a/src/net/tmwserv/tradehandler.h
+++ b/src/net/manaserv/tradehandler.h
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TMWSERV_TRADEHANDLER_H
-#define NET_TMWSERV_TRADEHANDLER_H
+#ifndef NET_MANASERV_TRADEHANDLER_H
+#define NET_MANASERV_TRADEHANDLER_H
 
 #include "net/messagehandler.h"
 #include "net/tradehandler.h"
 
-namespace TmwServ {
+namespace ManaServ {
 
 class TradeHandler : public MessageHandler, public Net::TradeHandler
 {
@@ -69,6 +69,6 @@ class TradeHandler : public MessageHandler, public Net::TradeHandler
         bool mAcceptTradeRequests;
 };
 
-} // namespace TmwServ
+} // namespace ManaServ
 
 #endif
diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp
index 4cb6af0b..ace223c4 100644
--- a/src/net/messagehandler.cpp
+++ b/src/net/messagehandler.cpp
@@ -21,8 +21,8 @@
 
 #include "net/messagehandler.h"
 
-#ifdef TMWSERV_SUPPORT
-#include "net/tmwserv/network.h"
+#ifdef MANASERV_SUPPORT
+#include "net/manaserv/network.h"
 #else
 #include "net/ea/network.h"
 #endif
@@ -38,7 +38,7 @@ MessageHandler::MessageHandler()
 
 MessageHandler::~MessageHandler()
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     Net::unregisterHandler(this);
 #else
     if (mNetwork)
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 5a2726f6..1e85133f 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -21,7 +21,7 @@
 
 #include "net/messagein.h"
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 #include <enet/enet.h>
 #else
 #include <SDL.h>
@@ -57,7 +57,7 @@ int MessageIn::readInt16()
     int value = -1;
     if (mPos + 2 <= mLength)
     {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         uint16_t t;
         memcpy(&t, mData + mPos, 2);
         value = (unsigned short) ENET_NET_TO_HOST_16(t);
@@ -67,7 +67,7 @@ int MessageIn::readInt16()
 #else
         value = (*(Sint16*)(mData + mPos));
 #endif
-#endif // TMWSERV_SUPPORT
+#endif // MANASERV_SUPPORT
     }
     mPos += 2;
     return value;
@@ -78,7 +78,7 @@ int MessageIn::readInt32()
     int value = -1;
     if (mPos + 4 <= mLength)
     {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         uint32_t t;
         memcpy(&t, mData + mPos, 4);
         value = ENET_NET_TO_HOST_32(t);
@@ -88,7 +88,7 @@ int MessageIn::readInt32()
 #else
         value = (*(Sint32*)(mData + mPos));
 #endif
-#endif // TMWSERV_SUPPORT
+#endif // MANASERV_SUPPORT
     }
     mPos += 4;
     return value;
diff --git a/src/net/messagein.h b/src/net/messagein.h
index feb5a82f..17a73e2d 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -59,7 +59,7 @@ class MessageIn
 
         /**
          * Reads a 3-byte block containing tile-based coordinates. Used by
-         * tmwserv.
+         * manaserv.
          */
         void readCoordinates(Uint16 &x, Uint16 &y);
 
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 133aac96..7d87a849 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -21,7 +21,7 @@
 
 #include "net/messageout.h"
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 #include <enet/enet.h>
 #else
 #include "net/ea/network.h"
@@ -46,7 +46,7 @@ MessageOut::MessageOut(short id):
     writeInt16(id);
 }
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 MessageOut::~MessageOut()
 {
     free(mData);
@@ -61,7 +61,7 @@ void MessageOut::expand(size_t bytes)
 
 void MessageOut::writeInt8(Sint8 value)
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     expand(mPos + 1);
 #else
     mNetwork->mOutSize += 1;
@@ -72,7 +72,7 @@ void MessageOut::writeInt8(Sint8 value)
 
 void MessageOut::writeInt16(Sint16 value)
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     expand(mPos + 2);
     uint16_t t = ENET_HOST_TO_NET_16(value);
     memcpy(mData + mPos, &t, 2);
@@ -83,13 +83,13 @@ void MessageOut::writeInt16(Sint16 value)
     (*(Sint16 *)(mData + mPos)) = value;
 #endif
     mNetwork->mOutSize += 2;
-#endif // TMWSERV_SUPPORT
+#endif // MANASERV_SUPPORT
     mPos += 2;
 }
 
 void MessageOut::writeInt32(Sint32 value)
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     expand(mPos + 4);
     uint32_t t = ENET_HOST_TO_NET_32(value);
     memcpy(mData + mPos, &t, 4);
@@ -100,7 +100,7 @@ void MessageOut::writeInt32(Sint32 value)
     (*(Sint32 *)(mData + mPos)) = value;
 #endif
     mNetwork->mOutSize += 4;
-#endif // TMWSERV_SUPPORT
+#endif // MANASERV_SUPPORT
     mPos += 4;
 }
 
@@ -179,7 +179,7 @@ void MessageOut::writeString(const std::string &string, int length)
         // Make sure the length of the string is no longer than specified
         stringLength = length;
     }
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     expand(mPos + length);
 #else
     mNetwork->mOutSize += length;
diff --git a/src/net/messageout.h b/src/net/messageout.h
index f44aaa95..b232fdf8 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -32,7 +32,7 @@ class Network;
 /**
  * Used for building an outgoing message.
  *
- * With tmwserv, the message is sent using Net::Connection::send() when
+ * With manaserv, the message is sent using Net::Connection::send() when
  * finished.
  *
  * \ingroup Network
@@ -45,7 +45,7 @@ class MessageOut
          */
         MessageOut(short id);
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         /**
          * Destructor.
          */
@@ -83,7 +83,7 @@ class MessageOut
         short mID;
 
     private:
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         /**
          * Expand the packet data to be able to hold more data.
          *
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 5eccccf9..d847dbbb 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -37,8 +37,8 @@
 #include "net/specialhandler.h"
 #include "net/tradehandler.h"
 
-#ifdef TMWSERV_SUPPORT
-#include "net/tmwserv/generalhandler.h"
+#ifdef MANASERV_SUPPORT
+#include "net/manaserv/generalhandler.h"
 #else
 #include "net/ea/generalhandler.h"
 #endif
@@ -138,8 +138,8 @@ void Net::connectToServer(const ServerInfo &server)
     }
     else
     {
-#ifdef TMWSERV_SUPPORT
-        new TmwServ::GeneralHandler;
+#ifdef MANASERV_SUPPORT
+        new ManaServ::GeneralHandler;
 #else
         new EAthena::GeneralHandler;
 #endif