90 files changed, 476 insertions, 476 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0b0c489e..4c80f29e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -479,83 +479,83 @@ SET(SRCS_EA
     net/ea/tradehandler.h
     )
 
-SET(SRCS_TMW
+SET(SRCS_MANA
     gui/buddywindow.cpp
     gui/buddywindow.h
     gui/guildlistbox.cpp
     gui/guildlistbox.h
     gui/guildwindow.cpp
     gui/guildwindow.h
-    net/tmwserv/accountserver/account.cpp
-    net/tmwserv/accountserver/account.h
-    net/tmwserv/accountserver/accountserver.cpp
-    net/tmwserv/accountserver/accountserver.h
-    net/tmwserv/accountserver/internal.cpp
-    net/tmwserv/accountserver/internal.h
-    net/tmwserv/chatserver/chatserver.cpp
-    net/tmwserv/chatserver/chatserver.h
-    net/tmwserv/chatserver/guild.cpp
-    net/tmwserv/chatserver/guild.h
-    net/tmwserv/chatserver/internal.cpp
-    net/tmwserv/chatserver/internal.h
-    net/tmwserv/chatserver/party.cpp
-    net/tmwserv/chatserver/party.h
-    net/tmwserv/gameserver/gameserver.cpp
-    net/tmwserv/gameserver/gameserver.h
-    net/tmwserv/gameserver/internal.cpp
-    net/tmwserv/gameserver/internal.h
-    net/tmwserv/gameserver/player.cpp
-    net/tmwserv/gameserver/player.h
-    net/tmwserv/adminhandler.cpp
-    net/tmwserv/adminhandler.h
-    net/tmwserv/beinghandler.cpp
-    net/tmwserv/beinghandler.h
-    net/tmwserv/buysellhandler.cpp
-    net/tmwserv/buysellhandler.h
-    net/tmwserv/charhandler.cpp
-    net/tmwserv/charhandler.h
-    net/tmwserv/chathandler.cpp
-    net/tmwserv/chathandler.h
-    net/tmwserv/connection.cpp
-    net/tmwserv/connection.h
-    net/tmwserv/effecthandler.cpp
-    net/tmwserv/effecthandler.h
-    net/tmwserv/gamehandler.cpp
-    net/tmwserv/gamehandler.h
-    net/tmwserv/generalhandler.cpp
-    net/tmwserv/generalhandler.h
-    net/tmwserv/guildhandler.cpp
-    net/tmwserv/guildhandler.h
-    net/tmwserv/internal.cpp
-    net/tmwserv/internal.h
-    net/tmwserv/inventoryhandler.cpp
-    net/tmwserv/inventoryhandler.h
-    net/tmwserv/itemhandler.h
-    net/tmwserv/itemhandler.cpp
-    net/tmwserv/loginhandler.cpp
-    net/tmwserv/loginhandler.h
-    net/tmwserv/network.cpp
-    net/tmwserv/network.h
-    net/tmwserv/npchandler.cpp
-    net/tmwserv/npchandler.h
-    net/tmwserv/partyhandler.cpp
-    net/tmwserv/partyhandler.h
-    net/tmwserv/playerhandler.cpp
-    net/tmwserv/playerhandler.h
-    net/tmwserv/protocol.h
-    net/tmwserv/specialhandler.cpp
-    net/tmwserv/specialhandler.h
-    net/tmwserv/tradehandler.cpp
-    net/tmwserv/tradehandler.h
+    net/manaserv/accountserver/account.cpp
+    net/manaserv/accountserver/account.h
+    net/manaserv/accountserver/accountserver.cpp
+    net/manaserv/accountserver/accountserver.h
+    net/manaserv/accountserver/internal.cpp
+    net/manaserv/accountserver/internal.h
+    net/manaserv/chatserver/chatserver.cpp
+    net/manaserv/chatserver/chatserver.h
+    net/manaserv/chatserver/guild.cpp
+    net/manaserv/chatserver/guild.h
+    net/manaserv/chatserver/internal.cpp
+    net/manaserv/chatserver/internal.h
+    net/manaserv/chatserver/party.cpp
+    net/manaserv/chatserver/party.h
+    net/manaserv/gameserver/gameserver.cpp
+    net/manaserv/gameserver/gameserver.h
+    net/manaserv/gameserver/internal.cpp
+    net/manaserv/gameserver/internal.h
+    net/manaserv/gameserver/player.cpp
+    net/manaserv/gameserver/player.h
+    net/manaserv/adminhandler.cpp
+    net/manaserv/adminhandler.h
+    net/manaserv/beinghandler.cpp
+    net/manaserv/beinghandler.h
+    net/manaserv/buysellhandler.cpp
+    net/manaserv/buysellhandler.h
+    net/manaserv/charhandler.cpp
+    net/manaserv/charhandler.h
+    net/manaserv/chathandler.cpp
+    net/manaserv/chathandler.h
+    net/manaserv/connection.cpp
+    net/manaserv/connection.h
+    net/manaserv/effecthandler.cpp
+    net/manaserv/effecthandler.h
+    net/manaserv/gamehandler.cpp
+    net/manaserv/gamehandler.h
+    net/manaserv/generalhandler.cpp
+    net/manaserv/generalhandler.h
+    net/manaserv/guildhandler.cpp
+    net/manaserv/guildhandler.h
+    net/manaserv/internal.cpp
+    net/manaserv/internal.h
+    net/manaserv/inventoryhandler.cpp
+    net/manaserv/inventoryhandler.h
+    net/manaserv/itemhandler.h
+    net/manaserv/itemhandler.cpp
+    net/manaserv/loginhandler.cpp
+    net/manaserv/loginhandler.h
+    net/manaserv/network.cpp
+    net/manaserv/network.h
+    net/manaserv/npchandler.cpp
+    net/manaserv/npchandler.h
+    net/manaserv/partyhandler.cpp
+    net/manaserv/partyhandler.h
+    net/manaserv/playerhandler.cpp
+    net/manaserv/playerhandler.h
+    net/manaserv/protocol.h
+    net/manaserv/specialhandler.cpp
+    net/manaserv/specialhandler.h
+    net/manaserv/tradehandler.cpp
+    net/manaserv/tradehandler.h
     guild.cpp
     guild.h
     )
 
 
-SET (PROGRAMS tmw tmw-ea)
+SET (PROGRAMS mana mana-ea)
 
-ADD_EXECUTABLE(tmw WIN32 ${SRCS} ${SRCS_TMW})
-ADD_EXECUTABLE(tmw-ea WIN32 ${SRCS} ${SRCS_EA})
+ADD_EXECUTABLE(mana WIN32 ${SRCS} ${SRCS_MANA})
+ADD_EXECUTABLE(mana-ea WIN32 ${SRCS} ${SRCS_EA})
 
 FOREACH(program ${PROGRAMS})
     TARGET_LINK_LIBRARIES(${program} ${SDL_LIBRARY}
@@ -575,7 +575,7 @@ FOREACH(program ${PROGRAMS})
 ENDFOREACH(program)
 
 SET(FLAGS_EA "${FLAGS} -DEATHENA_SUPPORT")
-SET(FLAGS_TMW "${FLAGS} -DTMWSERV_SUPPORT")
+SET(FLAGS_MANA "${FLAGS} -DMANASERV_SUPPORT")
 
-SET_TARGET_PROPERTIES(tmw PROPERTIES COMPILE_FLAGS "${FLAGS_TMW}")
-SET_TARGET_PROPERTIES(tmw-ea PROPERTIES COMPILE_FLAGS "${FLAGS_EA}")
+SET_TARGET_PROPERTIES(mana PROPERTIES COMPILE_FLAGS "${FLAGS_MANA}")
+SET_TARGET_PROPERTIES(mana-ea PROPERTIES COMPILE_FLAGS "${FLAGS_EA}")
diff --git a/src/Makefile.am b/src/Makefile.am
index 12ff8f94..a4849dfa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-bin_PROGRAMS = tmw
+bin_PROGRAMS = mana
 
-tmw_CXXFLAGS = -DPKG_DATADIR=\""$(pkgdatadir)/"\"      \
+mana_CXXFLAGS = -DPKG_DATADIR=\""$(pkgdatadir)/"\"      \
 	       -DLOCALEDIR=\""$(localedir)"\"
 
-tmw_SOURCES = gui/widgets/avatar.cpp \
+mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/widgets/avatar.h \
 	      gui/widgets/browserbox.cpp \
 	      gui/widgets/browserbox.h \
@@ -387,83 +387,83 @@ tmw_SOURCES = gui/widgets/avatar.cpp \
 	      vector.cpp \
 	      vector.h
 
-if SERVER_TMWSERV
-tmw_CXXFLAGS += -DTMWSERV_SUPPORT
-tmw_SOURCES += \
+if SERVER_MANASERV
+mana_CXXFLAGS += -DMANASERV_SUPPORT
+mana_SOURCES += \
 	      gui/buddywindow.cpp \
 	      gui/buddywindow.h \
 	      gui/guildlistbox.cpp \
 	      gui/guildlistbox.h \
 	      gui/guildwindow.cpp \
 	      gui/guildwindow.h \
-	      net/tmwserv/accountserver/account.cpp \
-	      net/tmwserv/accountserver/account.h \
-	      net/tmwserv/accountserver/accountserver.cpp \
-	      net/tmwserv/accountserver/accountserver.h \
-	      net/tmwserv/accountserver/internal.cpp \
-	      net/tmwserv/accountserver/internal.h \
-	      net/tmwserv/chatserver/chatserver.cpp \
-	      net/tmwserv/chatserver/chatserver.h \
-	      net/tmwserv/chatserver/guild.cpp \
-	      net/tmwserv/chatserver/guild.h \
-	      net/tmwserv/chatserver/internal.cpp \
-	      net/tmwserv/chatserver/internal.h \
-	      net/tmwserv/chatserver/party.cpp \
-	      net/tmwserv/chatserver/party.h \
-	      net/tmwserv/gameserver/gameserver.cpp \
-	      net/tmwserv/gameserver/gameserver.h \
-	      net/tmwserv/gameserver/internal.cpp \
-	      net/tmwserv/gameserver/internal.h \
-	      net/tmwserv/gameserver/player.cpp \
-	      net/tmwserv/gameserver/player.h \
-	      net/tmwserv/adminhandler.cpp \
-	      net/tmwserv/adminhandler.h \
-	      net/tmwserv/beinghandler.cpp \
-	      net/tmwserv/beinghandler.h \
-	      net/tmwserv/buysellhandler.cpp \
-	      net/tmwserv/buysellhandler.h \
-	      net/tmwserv/charhandler.cpp \
-	      net/tmwserv/charhandler.h \
-	      net/tmwserv/chathandler.cpp \
-	      net/tmwserv/chathandler.h \
-	      net/tmwserv/connection.cpp \
-	      net/tmwserv/connection.h \
-	      net/tmwserv/effecthandler.cpp \
-	      net/tmwserv/effecthandler.h \
-	      net/tmwserv/gamehandler.cpp \
-	      net/tmwserv/gamehandler.h \
-	      net/tmwserv/generalhandler.cpp \
-	      net/tmwserv/generalhandler.h \
-	      net/tmwserv/guildhandler.cpp \
-	      net/tmwserv/guildhandler.h \
-	      net/tmwserv/internal.cpp \
-	      net/tmwserv/internal.h \
-	      net/tmwserv/inventoryhandler.cpp \
-	      net/tmwserv/inventoryhandler.h \
-	      net/tmwserv/itemhandler.h \
-	      net/tmwserv/itemhandler.cpp \
-	      net/tmwserv/loginhandler.cpp \
-	      net/tmwserv/loginhandler.h \
-	      net/tmwserv/network.cpp \
-	      net/tmwserv/network.h \
-	      net/tmwserv/npchandler.cpp \
-	      net/tmwserv/npchandler.h \
-	      net/tmwserv/partyhandler.cpp \
-	      net/tmwserv/partyhandler.h \
-	      net/tmwserv/playerhandler.cpp \
-	      net/tmwserv/playerhandler.h \
-	      net/tmwserv/protocol.h \
-	      net/tmwserv/specialhandler.cpp \
-	      net/tmwserv/specialhandler.h \
-	      net/tmwserv/tradehandler.cpp \
-	      net/tmwserv/tradehandler.h \
+	      net/manaserv/accountserver/account.cpp \
+	      net/manaserv/accountserver/account.h \
+	      net/manaserv/accountserver/accountserver.cpp \
+	      net/manaserv/accountserver/accountserver.h \
+	      net/manaserv/accountserver/internal.cpp \
+	      net/manaserv/accountserver/internal.h \
+	      net/manaserv/chatserver/chatserver.cpp \
+	      net/manaserv/chatserver/chatserver.h \
+	      net/manaserv/chatserver/guild.cpp \
+	      net/manaserv/chatserver/guild.h \
+	      net/manaserv/chatserver/internal.cpp \
+	      net/manaserv/chatserver/internal.h \
+	      net/manaserv/chatserver/party.cpp \
+	      net/manaserv/chatserver/party.h \
+	      net/manaserv/gameserver/gameserver.cpp \
+	      net/manaserv/gameserver/gameserver.h \
+	      net/manaserv/gameserver/internal.cpp \
+	      net/manaserv/gameserver/internal.h \
+	      net/manaserv/gameserver/player.cpp \
+	      net/manaserv/gameserver/player.h \
+	      net/manaserv/adminhandler.cpp \
+	      net/manaserv/adminhandler.h \
+	      net/manaserv/beinghandler.cpp \
+	      net/manaserv/beinghandler.h \
+	      net/manaserv/buysellhandler.cpp \
+	      net/manaserv/buysellhandler.h \
+	      net/manaserv/charhandler.cpp \
+	      net/manaserv/charhandler.h \
+	      net/manaserv/chathandler.cpp \
+	      net/manaserv/chathandler.h \
+	      net/manaserv/connection.cpp \
+	      net/manaserv/connection.h \
+	      net/manaserv/effecthandler.cpp \
+	      net/manaserv/effecthandler.h \
+	      net/manaserv/gamehandler.cpp \
+	      net/manaserv/gamehandler.h \
+	      net/manaserv/generalhandler.cpp \
+	      net/manaserv/generalhandler.h \
+	      net/manaserv/guildhandler.cpp \
+	      net/manaserv/guildhandler.h \
+	      net/manaserv/internal.cpp \
+	      net/manaserv/internal.h \
+	      net/manaserv/inventoryhandler.cpp \
+	      net/manaserv/inventoryhandler.h \
+	      net/manaserv/itemhandler.h \
+	      net/manaserv/itemhandler.cpp \
+	      net/manaserv/loginhandler.cpp \
+	      net/manaserv/loginhandler.h \
+	      net/manaserv/network.cpp \
+	      net/manaserv/network.h \
+	      net/manaserv/npchandler.cpp \
+	      net/manaserv/npchandler.h \
+	      net/manaserv/partyhandler.cpp \
+	      net/manaserv/partyhandler.h \
+	      net/manaserv/playerhandler.cpp \
+	      net/manaserv/playerhandler.h \
+	      net/manaserv/protocol.h \
+	      net/manaserv/specialhandler.cpp \
+	      net/manaserv/specialhandler.h \
+	      net/manaserv/tradehandler.cpp \
+	      net/manaserv/tradehandler.h \
 	      guild.cpp \
 	      guild.h
 endif
 
 if SERVER_EATHENA
-tmw_CXXFLAGS += -DEATHENA_SUPPORT
-tmw_SOURCES += \
+mana_CXXFLAGS += -DEATHENA_SUPPORT
+mana_SOURCES += \
 	      net/ea/gui/partytab.cpp \
 	      net/ea/gui/partytab.h \
 	      net/ea/adminhandler.cpp \
diff --git a/src/being.cpp b/src/being.cpp
index 69e01dba..6542a14b 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -88,7 +88,7 @@ Being::Being(int id, int job, Map *map):
     mStatusParticleEffects(&mStunParticleEffects, false),
     mChildParticleEffects(&mStatusParticleEffects, false),
     mMustResetParticles(false),
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mWalkSpeed(6.0f), // default speed in tile per second
 #else
     mWalkSpeed(150),
@@ -143,7 +143,7 @@ void Being::setDestination(Uint16 destX, Uint16 destY)
 }
 #endif
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 void Being::setDestination(int dstX, int dstY)
 {
     mDest.x = dstX;
@@ -200,7 +200,7 @@ void Being::setDestination(int dstX, int dstY)
 
     setPath(thisPath);
 }
-#endif  // TMWSERV_SUPPORT
+#endif  // MANASERV_SUPPORT
 
 void Being::clearPath()
 {
@@ -526,7 +526,7 @@ void Being::logic()
         mText = 0;
     }
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     if (mAction != DEAD)
     {
         const Vector dest = (mPath.empty()) ?
diff --git a/src/being.h b/src/being.h
index c6c49f5e..b1a08e37 100644
--- a/src/being.h
+++ b/src/being.h
@@ -261,14 +261,14 @@ class Being : public Sprite, public ConfigListener
         /**
          * Sets the walk speed.
          * in pixels per second for eAthena,
-         * in tiles per second for TMWserv.
+         * in tiles per second for Manaserv.
          */
         void setWalkSpeed(float speed) { mWalkSpeed = speed; }
 
         /**
          * Gets the walk speed.
          * in pixels per second for eAthena,
-         * in tiles per second for TMWserv (0.1 precision).
+         * in tiles per second for Manaserv (0.1 precision).
          */
         float getWalkSpeed() const { return mWalkSpeed; }
 
@@ -578,7 +578,7 @@ class Being : public Sprite, public ConfigListener
         /**
          * Walk speed.
          * In pixels per second for eAthena,
-         * In tiles per second (0.1 precision) for TMWserv.
+         * In tiles per second (0.1 precision) for Manaserv.
          */
         float mWalkSpeed;
 
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 0b8f71b5..2ad3f0fd 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -26,8 +26,8 @@
 #include "npc.h"
 #include "player.h"
 
-#ifdef TMWSERV_SUPPORT
-#include "net/tmwserv/protocol.h"
+#ifdef MANASERV_SUPPORT
+#include "net/manaserv/protocol.h"
 #endif
 
 #include "utils/dtor.h"
@@ -215,7 +215,7 @@ Being *BeingManager::findNearestLivingBeing(int x, int y, int maxdist,
     Being *closestBeing = NULL;
     int dist = 0;
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     //Why do we do this:
     //For some reason x,y passed to this function is always
     //in map coords, while down below its in pixels
@@ -233,7 +233,7 @@ Being *BeingManager::findNearestLivingBeing(int x, int y, int maxdist,
     for (; itr != itr_end; ++itr)
     {
         Being *being = (*itr);
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         const Vector &pos = being->getPosition();
         int d = abs(((int) pos.x) - x) + abs(((int) pos.y) - y);
 #else
@@ -257,7 +257,7 @@ Being *BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
 {
     Being *closestBeing = NULL;
     int dist = 0;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     const Vector &apos = aroundBeing->getPosition();
     int x = apos.x;
     int y = apos.y;
@@ -271,7 +271,7 @@ Being *BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
          i != i_end; ++i)
     {
         Being *being = (*i);
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         const Vector &pos = being->getPosition();
         int d = abs(((int) pos.x) - x) + abs(((int) pos.y) - y);
 #else
diff --git a/src/game.cpp b/src/game.cpp
index 0d09be01..5927924c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -68,7 +68,7 @@
 #include "gui/viewport.h"
 #include "gui/windowmenu.h"
 #include "gui/partywindow.h"
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 #include "gui/buddywindow.h"
 #include "gui/guildwindow.h"
 #endif
@@ -81,7 +81,7 @@
 #include "net/generalhandler.h"
 #include "net/net.h"
 
-#include "net/tmwserv/inventoryhandler.h"
+#include "net/manaserv/inventoryhandler.h"
 #include "net/ea/inventoryhandler.h"
 
 #include "resources/imagewriter.h"
@@ -121,7 +121,7 @@ BuySellDialog *buySellDialog;
 InventoryWindow *inventoryWindow;
 SkillDialog *skillDialog;
 PartyWindow *partyWindow;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 BuddyWindow *buddyWindow;
 GuildWindow *guildWindow;
 #endif
@@ -241,7 +241,7 @@ static void createGuiWindows()
     sellDialog = new SellDialog;
     tradeWindow = new TradeWindow;
     partyWindow = new PartyWindow;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     buddyWindow = new BuddyWindow;
     guildWindow = new GuildWindow;
 #else
@@ -295,7 +295,7 @@ static void destroyGuiWindows()
     delete partyWindow;
     delete npcDialog;
     delete npcPostDialog;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     delete buddyWindow;
     delete guildWindow;
 #endif
@@ -331,7 +331,7 @@ Game::Game():
         mSecondsCounterId = SDL_AddTimer(1000, nextSecond, NULL);
 
         // This part is eAthena specific
-        // For TMWserv, the map is obtained
+        // For Manaserv, the map is obtained
         // with the GPMSG_PLAYER_MAP_CHANGE flag.
         map_path = map_path.substr(0, map_path.rfind("."));
         if (!map_path.empty())
@@ -776,7 +776,7 @@ void Game::handleInput()
                 {
                     case KeyboardConfig::KEY_PICKUP:
                         {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
                             const Vector &pos = player_node->getPosition();
                             Uint16 x = (int) pos.x / 32;
                             Uint16 y = (int) pos.y / 32;
@@ -828,7 +828,7 @@ void Game::handleInput()
                             equipmentWindow->setVisible(false);
                             helpWindow->setVisible(false);
                             debugWindow->setVisible(false);
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
                             guildWindow->setVisible(false);
                             buddyWindow->setVisible(false);
 #endif
@@ -1001,7 +1001,7 @@ void Game::handleInput()
             // A set target has highest priority
             if (!player_node->getTarget())
             {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
                 Uint16 targetX = x / 32, targetY = y / 32;
 #else
                 Uint16 targetX = x, targetY = y;
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 2bb9cff3..85d97e6b 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -41,8 +41,8 @@
 #include "main.h"
 #include "units.h"
 
-#ifdef TMWSERV_SUPPORT
-#include "net/tmwserv/accountserver/account.h"
+#ifdef MANASERV_SUPPORT
+#include "net/manaserv/accountserver/account.h"
 #else
 #include "net/ea/protocol.h"
 #endif
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 05af7780..9cebc4e1 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -38,7 +38,7 @@
 #include "log.h"
 #include "localplayer.h"
 
-#include "net/tmwserv/chatserver/guild.h"
+#include "net/manaserv/chatserver/guild.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 9a1f4805..aecca0c6 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -82,7 +82,7 @@ void PlayerBox::draw(gcn::Graphics *graphics)
     {
         // Draw character
         const int bs = getFrameSize();
-//#ifdef TMWSERV_SUPPORT
+//#ifdef MANASERV_SUPPORT
         const int x = getWidth() / 2 + bs;
         const int y = getHeight() - bs - 8;
         mPlayer->draw(static_cast<Graphics*>(graphics), x, y);
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index fb987363..54c0f334 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -128,7 +128,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
                 /*mBrowserBox->addRow(strprintf("@@buddy|%s@@",
                                         strprintf(_("Add %s to Buddy List"),
                                                   name.c_str()).c_str()));*/
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
                 mBrowserBox->addRow(strprintf("@@guild|%s@@",
                                 strprintf(_("Invite %s to join your guild"),
                                                     name.c_str()).c_str()));
@@ -253,7 +253,7 @@ void PopupMenu::handleLink(const std::string &link)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
     }
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     // Guild action
     else if (link == "guild" &&
              being != NULL &&
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index e97eb099..9051a5f2 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -351,8 +351,8 @@ void ServerDialog::loadServers()
             if (xmlStrEqual(server->name, BAD_CAST "server"))
             {
                 //check wether the version matches
-                #ifdef TMWSERV_SUPPORT
-                if (XML::getProperty(server, "type", "unknown") != "TMWSERV")
+                #ifdef MANASERV_SUPPORT
+                if (XML::getProperty(server, "type", "unknown") != "MANASERV")
                     continue;
                 #endif
 
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index e89b7437..81b83fe6 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -81,7 +81,7 @@ class ChangeDisplay : public AttrDisplay, gcn::ActionListener
         int mNeeded;
 
         Label *mPoints;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         Button *mDec;
 #endif
         Button *mInc;
@@ -163,7 +163,7 @@ StatusWindow::StatusWindow():
 
     mCharacterPointsLabel = new Label("C");
     place(0, 6, mCharacterPointsLabel, 5);
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mCorrectionPointsLabel = new Label("C");
     place(0, 7, mCorrectionPointsLabel, 5);
 #endif
@@ -231,7 +231,7 @@ std::string StatusWindow::update(int id)
                                         player_node->getCharacterPoints()));
         mCharacterPointsLabel->adjustSize();
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         mCorrectionPointsLabel->setCaption(strprintf(_("Correction points: %d"),
                                         player_node->getCorrectionPoints()));
         mCorrectionPointsLabel->adjustSize();
@@ -486,7 +486,7 @@ ChangeDisplay::ChangeDisplay(int id, const std::string &name):
     place(6, 0, mInc);
     place(7, 0, mPoints);
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mDec = new Button(_("-"), "dec", this);
     mDec->setWidth(mInc->getWidth());
 
@@ -500,7 +500,7 @@ std::string ChangeDisplay::update()
 {
     mPoints->setCaption(toString(mNeeded));
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mDec->setEnabled(player_node->getCorrectionPoints());
 #endif
     mInc->setEnabled(player_node->getCharacterPoints() >= mNeeded);
@@ -517,7 +517,7 @@ void ChangeDisplay::setPointsNeeded(int needed)
 
 void ChangeDisplay::action(const gcn::ActionEvent &event)
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     if (event.getSource() == mDec)
     {
         int newcorpoints = player_node->getCorrectionPoints() - 1;
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index ce68eb4c..0706a17e 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -90,7 +90,7 @@ class StatusWindow : public Window
         ScrollArea *mDAttrScroll;
 
         gcn::Label *mCharacterPointsLabel;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         gcn::Label *mCorrectionPointsLabel;
 #endif
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index cf21288c..21a6ec80 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -55,7 +55,7 @@ Viewport::Viewport():
     mShowDebugPath(false),
     mVisibleNames(false),
     mPlayerFollowMouse(false),
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mLocalWalkTime(-1)
 #else
     mWalkTime(0)
@@ -369,7 +369,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
         // Just walk around
         else
         {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
             // FIXME: REALLY UGLY!
             Uint8 *keys = SDL_GetKeyState(NULL);
             if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]) &&
@@ -404,7 +404,7 @@ void Viewport::mouseDragged(gcn::MouseEvent &event)
     if (!mMap || !player_node)
         return;
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     if (mPlayerFollowMouse
         && get_elapsed_time(mLocalWalkTime) >= walkingMouseDelay)
     {
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 33a2d837..39dfaa33 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -172,7 +172,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         bool mVisibleNames;          /**< Show target names. */
 
         bool mPlayerFollowMouse;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         int mLocalWalkTime; /**< Timestamp before the next walk can be sent. */
 #else
         int mWalkTime;
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index b73558c0..4e0313b6 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -43,7 +43,7 @@ extern Window *setupWindow;
 extern Window *skillDialog;
 extern Window *specialsWindow;
 extern Window *statusWindow;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 extern Window *buddyWindow;
 extern Window *guildWindow;
 #endif
@@ -60,7 +60,7 @@ WindowMenu::WindowMenu():
         N_("Inventory"),
         N_("Skills"),
         N_("Specials"),
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         N_("Guilds"),
         N_("Buddies"),
 #endif
@@ -133,7 +133,7 @@ void WindowMenu::action(const gcn::ActionEvent &event)
     {
         window = specialsWindow;
     }
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     else if (event.getId() == "Guilds")
     {
         window = guildWindow;
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 42da1bf9..bc5f55a4 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -54,11 +54,11 @@
 #include "net/tradehandler.h"
 
 #include "effectmanager.h"
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 #include "guild.h"
 
-//#include "net/tmwserv/gameserver/player.h"
-#include "net/tmwserv/chatserver/guild.h"
+//#include "net/manaserv/gameserver/player.h"
+#include "net/manaserv/chatserver/guild.h"
 #endif
 
 #include "resources/animation.h"
@@ -72,7 +72,7 @@
 
 #include <cassert>
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 // This is the minimal delay between to permitted
 // setDestination() calls using the keyboard.
 // TODO: This can fine tuned later on when running is added...
@@ -106,7 +106,7 @@ LocalPlayer::LocalPlayer(int id, int job, Map *map):
     mPathSetByMouse(false),
     mDestX(0), mDestY(0),
     mInventory(new Inventory(INVENTORY_SIZE)),
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mLocalWalkTime(-1),
 #endif
     mStorage(new Inventory(STORAGE_SIZE)),
@@ -214,7 +214,7 @@ void LocalPlayer::logic()
         }
         else
         {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
             // Find whether target is in range
             const int rangeX = abs(mTarget->getPosition().x - getPosition().x);
             const int rangeY = abs(mTarget->getPosition().y - getPosition().y);
@@ -296,7 +296,7 @@ void LocalPlayer::nextStep(unsigned char dir = 0)
 
 
     Player::nextStep();
-#else // TMWSERV_SUPPORT
+#else // MANASERV_SUPPORT
         if (!mMap || !dir)
         return;
 
@@ -357,7 +357,7 @@ void LocalPlayer::nextStep(unsigned char dir = 0)
 }
 
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 bool LocalPlayer::checkInviteRights(const std::string &guildName)
 {
     Guild *guild = getGuild(guildName);
@@ -414,7 +414,7 @@ void LocalPlayer::pickUp(FloorItem *item)
     }
     else
     {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         setDestination(item->getX() * 32 + 16, item->getY() * 32 + 16);
 #else
         setDestination(item->getX(), item->getY());
@@ -463,13 +463,13 @@ void LocalPlayer::setTarget(Being *target)
         static_cast<Monster *>(target)->setShowName(true);
 }
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 void LocalPlayer::setDestination(int x, int y)
 #else
 void LocalPlayer::setDestination(Uint16 x, Uint16 y)
 #endif
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     // Check the walkability of the destination
     // If the destination is a wall, don't go there!
     if (!mMap->getWalk(x / 32, y / 32))
@@ -528,7 +528,7 @@ void LocalPlayer::setWalkingDir(int dir)
 {
     // This function is called by Game::handleInput()
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         // First if player is pressing key for the direction he is already
         // going, do nothing more...
 
@@ -561,7 +561,7 @@ void LocalPlayer::setWalkingDir(int dir)
     {
         startWalking(dir);
     }
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     else if (mAction == WALK)
     {
         nextStep(dir);
@@ -574,18 +574,18 @@ void LocalPlayer::startWalking(unsigned char dir)
     // This function is called by setWalkingDir(),
     // but also by nextStep() for eAthena...
 
-    // TODO: Evaluate the implementation of this method for tmwserv
+    // TODO: Evaluate the implementation of this method for Manaserv
     if (!mMap || !dir)
         return;
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     const Vector &pos = getPosition();
 #endif
 
     if (mAction == WALK && !mPath.empty())
     {
         // Just finish the current action, otherwise we get out of sync
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         Being::setDestination(pos.x, pos.y);
 #else
         Being::setDestination(getTileX(), getTileY());
@@ -625,7 +625,7 @@ void LocalPlayer::startWalking(unsigned char dir)
         Net::getPlayerHandler()->setDirection(dir);
         setDirection(dir);
     }
-#else // TMWSERV_SUPPORT
+#else // MANASERV_SUPPORT
     nextStep(dir);
 #endif
 }
@@ -634,7 +634,7 @@ void LocalPlayer::stopWalking(bool sendToServer)
 {
     if (mAction == WALK && mWalkingDir) {
         mWalkingDir = 0;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         mLocalWalkTime = 0;
 #endif
         Being::setDestination(getPosition().x,getPosition().y);
@@ -676,7 +676,7 @@ void LocalPlayer::emote(Uint8 emotion)
     Net::getPlayerHandler()->emote(emotion);
 }
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 /*
 void LocalPlayer::attack()
 {
@@ -746,7 +746,7 @@ void LocalPlayer::setSpecialStatus(int id, int current, int max, int recharge)
 
 void LocalPlayer::attack(Being *target, bool keep)
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     if (mLastAction != -1)
         return;
 
@@ -765,7 +765,7 @@ void LocalPlayer::attack(Being *target, bool keep)
         mLastTarget = -1;
         setTarget(target);
     }
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     Vector plaPos = this->getPosition();
     Vector tarPos = mTarget->getPosition();
     int dist_x = plaPos.x - tarPos.x;
@@ -779,7 +779,7 @@ void LocalPlayer::attack(Being *target, bool keep)
         return;
 #endif
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     if (abs(dist_y) >= abs(dist_x))
     {
         if (dist_y < 0)
@@ -811,7 +811,7 @@ void LocalPlayer::attack(Being *target, bool keep)
     }
 #endif
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mLastAction = tick_time;
 #else
     mWalkTime = tick_time;
@@ -1042,7 +1042,7 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, int amount)
 
 int LocalPlayer::getAttackRange()
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     Item *weapon = mEquipment->getEquipment(EQUIP_FIGHT1_SLOT);
     if (weapon)
     {
@@ -1057,7 +1057,7 @@ int LocalPlayer::getAttackRange()
 
 bool LocalPlayer::withinAttackRange(Being *target)
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     const Vector &targetPos = target->getPosition();
     const Vector &pos = getPosition();
     const int dx = abs(targetPos.x - pos.x);
@@ -1081,7 +1081,7 @@ bool LocalPlayer::withinAttackRange(Being *target)
 void LocalPlayer::setGotoTarget(Being *target)
 {
     mLastTarget = -1;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mTarget = target;
     mGoingToTarget = true;
     const Vector &targetPos = target->getPosition();
diff --git a/src/localplayer.h b/src/localplayer.h
index 57e1bb35..2c784ac4 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -101,7 +101,7 @@ enum
 class LocalPlayer : public Player
 {
     public:
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         enum Attribute
         {
             STR = 0, AGI, DEX, VIT, INT, WIL, CHR
@@ -141,7 +141,7 @@ class LocalPlayer : public Player
          */
         Inventory *getStorage() const { return mStorage; }
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         /**
          * Check the player has permission to invite users to specific guild
          */
@@ -226,7 +226,7 @@ class LocalPlayer : public Player
         /**
          * Sets a new destination for this being to walk to.
          */
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         void setDestination(int x, int y);
 #else
         virtual void setDestination(Uint16 x, Uint16 y);
@@ -440,7 +440,7 @@ class LocalPlayer : public Player
 
         Inventory *mInventory;
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         int mLocalWalkTime;   /**< Timestamp used to control keyboard walk
                                   messages flooding */
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index a0486a6a..32c36adf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -68,21 +68,21 @@
 #include "net/loginhandler.h"
 #include "net/net.h"
 #include "net/worldinfo.h"
-#ifdef TMWSERV_SUPPORT
-#include "net/tmwserv/charhandler.h"
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/generalhandler.h"
-#include "net/tmwserv/loginhandler.h"
-#include "net/tmwserv/network.h"
+#ifdef MANASERV_SUPPORT
+#include "net/manaserv/charhandler.h"
+#include "net/manaserv/connection.h"
+#include "net/manaserv/generalhandler.h"
+#include "net/manaserv/loginhandler.h"
+#include "net/manaserv/network.h"
 #endif
 
-#ifdef TMWSERV_SUPPORT
-#include "net/tmwserv/accountserver/accountserver.h"
-#include "net/tmwserv/accountserver/account.h"
+#ifdef MANASERV_SUPPORT
+#include "net/manaserv/accountserver/accountserver.h"
+#include "net/manaserv/accountserver/account.h"
 
-#include "net/tmwserv/chatserver/chatserver.h"
+#include "net/manaserv/chatserver/chatserver.h"
 
-#include "net/tmwserv/gameserver/gameserver.h"
+#include "net/manaserv/gameserver/gameserver.h"
 #endif
 
 #include "resources/colordb.h"
@@ -139,7 +139,7 @@ namespace
 static const int defaultSfxVolume = 100;
 static const int defaultMusicVolume = 60;
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 extern Net::Connection *gameServerConnection;
 extern Net::Connection *chatServerConnection;
 extern Net::Connection *accountServerConnection;
@@ -1215,7 +1215,7 @@ int main(int argc, char *argv[])
 
                 case STATE_UNREGISTER_SUCCESS:
                     logger->log("State: UNREGISTER SUCCESS");
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
                     accountServerConnection->disconnect();
 #endif
                     currentDialog = new OkDialog(_("Unregister Successful"),
@@ -1229,7 +1229,7 @@ int main(int argc, char *argv[])
                 case STATE_SWITCH_SERVER:
                     logger->log("State: SWITCH SERVER");
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
                     gameServerConnection->disconnect();
                     chatServerConnection->disconnect();
                     accountServerConnection->disconnect();
diff --git a/src/main.h b/src/main.h
index f999f600..fa30ade0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -62,8 +62,8 @@
 #endif
 
 #ifdef PACKAGE_VERSION
-#ifdef TMWSERV_SUPPORT
-#define FULL_VERSION "v" PACKAGE_VERSION " (tmwserv)"
+#ifdef MANASERV_SUPPORT
+#define FULL_VERSION "v" PACKAGE_VERSION " (manaserv)"
 #else
 #define FULL_VERSION "v" PACKAGE_VERSION " (eAthena)"
 #endif
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
diff --git a/src/player.cpp b/src/player.cpp
index 143f3521..abcfffe9 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -22,7 +22,7 @@
 #include "animatedsprite.h"
 #include "configuration.h"
 #include "game.h"
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 #include "guild.h"
 #endif
 #include "localplayer.h"
@@ -209,7 +209,7 @@ void Player::setSpriteColor(unsigned int slot, const std::string &color)
     setSprite(slot, mSpriteIDs[slot], color);
 }
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 Guild* Player::addGuild(short guildId, short rights)
 {
     Guild *guild = new Guild(guildId, rights);
diff --git a/src/player.h b/src/player.h
index 3c4cc258..a1ba1b5c 100644
--- a/src/player.h
+++ b/src/player.h
@@ -26,7 +26,7 @@
 
 class Graphics;
 class Map;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 class Guild;
 #endif
 
@@ -109,7 +109,7 @@ class Player : public Being
         virtual void setSpriteColor(unsigned int slot,
                                     const std::string &color = "");
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         /**
          * Adds a guild to the player.
          */
@@ -170,7 +170,7 @@ class Player : public Being
         std::vector<int> mSpriteIDs;
         std::vector<std::string> mSpriteColors;
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         // Character guild information
         std::map<int, Guild*> mGuilds;
 #endif