Basically finish rebranding

19 files changed, 105 insertions, 115 deletions

diff --git a/INSTALL b/INSTALL
index f9e03884..83cab33c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -55,7 +55,7 @@ you to figure this out.
 5) Run "make install" as root
 
 It should have installed Mana on your system now, and you can run it
-with "tmw". By default all files are installed to /usr/local, you can pass a
+with "mana". By default all files are installed to /usr/local, you can pass a
 different prefix to configure as usual.
 
 
diff --git a/Info.plist b/Info.plist
index 213f2ea0..9cbaea0c 100644
--- a/Info.plist
+++ b/Info.plist
@@ -9,17 +9,17 @@
 	<key>CFBundleIconFile</key>
 	<string>The Mana World.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>TMW</string>
+	<string>Mana</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
-	<string>tmw.</string>
+	<string>Mana.</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2008 The Mana World Development Team</string>
+	<string>Copyright 2009 Mana Development Team</string>
 	<key>NSMainNibFile</key>
 	<string>SDLMain</string>
 	<key>NSPrincipalClass</key>
diff --git a/Mana.vcproj b/Mana.vcproj
index 478a345c..b3ebef21 100644
--- a/Mana.vcproj
+++ b/Mana.vcproj
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="physfs.lib alleg.lib guichan.lib guichan_sdl.lib sdl.lib sdlmain.lib sdl_mixer.lib sdl_image.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
-				OutputFile="tmw.exe"
+				OutputFile="mana.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC.lib"
 				GenerateDebugInformation="true"
diff --git a/data/icons/mana.xpm b/data/icons/mana.xpm
index 06ec2865..99e857b1 100644
--- a/data/icons/mana.xpm
+++ b/data/icons/mana.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * tmw_xpm[] = {
+static char * mana_xpm[] = {
 "32 32 749 2",
 "  	c None",
 ". 	c #E4EB6D",
diff --git a/docs/clientupdates.txt b/docs/clientupdates.txt
index 24f36c7d..c5e38d8b 100644
--- a/docs/clientupdates.txt
+++ b/docs/clientupdates.txt
@@ -16,7 +16,7 @@ this functionality:
  4. Client notices he doesn't have a certain package yet or is out of date
  5. Client requests from server .torrent files (or maybe at first just URL)
     from where to get the the missing packages
- 6. Client downloads them and puts them in "data" directory (~/.tmw/data on
+ 6. Client downloads them and puts them in "data" directory (~/.mana/data on
     Linux, cause that's writable)
  7. Client loads the list of files server mentioned in PhysFS virtual
     filesystem
diff --git a/docs/mana.6 b/docs/mana.6
index afdc2118..d29d1bd5 100644
--- a/docs/mana.6
+++ b/docs/mana.6
@@ -1,6 +1,6 @@
 .TH "Mana" "6"
 .SH "NAME"
-tmw \- Mana: A 2D MMORPG client
+mana \- Mana: A 2D MMORPG client
 .SH "SYNOPSIS"
 \fBmana\fR
 .SH "DESCRIPTION"
diff --git a/mana.cbp b/mana.cbp
index 9715343c..f4dd1f0f 100644
--- a/mana.cbp
+++ b/mana.cbp
@@ -7,11 +7,11 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="eAthena">
-				<Option output="tmw-ea.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="mana-ea.exe" prefix_auto="0" extension_auto="0" />
 				<Option object_output=".objs/ea" />
 				<Option type="0" />
 				<Option compiler="gcc" />
-				<Option parameters='-u -d &quot;D:/tmw/data&quot;' />
+				<Option parameters='-u -d &quot;D:/mana/data&quot;' />
 				<Option projectResourceIncludeDirsRelation="0" />
 				<Compiler>
 					<Add option="-O3" />
@@ -45,11 +45,11 @@
 			</Target>
 			<Target title="Unix Manaserv">
 				<Option platforms="Unix;" />
-				<Option output="tmw" prefix_auto="1" extension_auto="1" />
+				<Option output="mana" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".objs/manaserv" />
 				<Option type="0" />
 				<Option compiler="gcc" />
-				<Option parameters='-u -d &quot;../tmwdata&quot;' />
+				<Option parameters='-u -d &quot;../manadata&quot;' />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
@@ -76,11 +76,11 @@
 				</Linker>
 			</Target>
 			<Target title="Manaserv">
-				<Option output="tmw-manaserv.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="mana-manaserv.exe" prefix_auto="0" extension_auto="0" />
 				<Option object_output=".objs/manaserv" />
 				<Option type="0" />
 				<Option compiler="gcc" />
-				<Option parameters='-u -d &quot;D:/tmw/data&quot;' />
+				<Option parameters='-u -d &quot;D:/mana/data&quot;' />
 				<Option projectResourceIncludeDirsRelation="0" />
 				<Compiler>
 					<Add option="-O3" />
@@ -115,7 +115,7 @@
 			</Target>
 			<Target title="UNIX eAthena">
 				<Option platforms="Unix;" />
-				<Option output="ea-tmw" prefix_auto="1" extension_auto="1" />
+				<Option output="ea-mana" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".objs/ea" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -626,242 +626,242 @@
 		<Unit filename="src/net/partyhandler.h" />
 		<Unit filename="src/net/playerhandler.h" />
 		<Unit filename="src/net/specialhandler.h" />
-		<Unit filename="src/net/tmwserv/accountserver/account.cpp">
+		<Unit filename="src/net/manaserv/accountserver/account.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/accountserver/account.h">
+		<Unit filename="src/net/manaserv/accountserver/account.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/accountserver/accountserver.cpp">
+		<Unit filename="src/net/manaserv/accountserver/accountserver.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/accountserver/accountserver.h">
+		<Unit filename="src/net/manaserv/accountserver/accountserver.h">
 			<Option target="Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/accountserver/internal.cpp">
+		<Unit filename="src/net/manaserv/accountserver/internal.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/accountserver/internal.h">
+		<Unit filename="src/net/manaserv/accountserver/internal.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/adminhandler.cpp">
+		<Unit filename="src/net/manaserv/adminhandler.cpp">
 			<Option target="Unix Manaserv" />
 			<Option target="Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/beinghandler.cpp">
+		<Unit filename="src/net/manaserv/beinghandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/beinghandler.h">
+		<Unit filename="src/net/manaserv/beinghandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/buysellhandler.cpp">
+		<Unit filename="src/net/manaserv/buysellhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/buysellhandler.h">
+		<Unit filename="src/net/manaserv/buysellhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/charhandler.cpp">
+		<Unit filename="src/net/manaserv/charhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/charhandler.h">
+		<Unit filename="src/net/manaserv/charhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chathandler.cpp">
+		<Unit filename="src/net/manaserv/chathandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chathandler.h">
+		<Unit filename="src/net/manaserv/chathandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chatserver/chatserver.cpp">
+		<Unit filename="src/net/manaserv/chatserver/chatserver.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chatserver/chatserver.h">
+		<Unit filename="src/net/manaserv/chatserver/chatserver.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chatserver/guild.cpp">
+		<Unit filename="src/net/manaserv/chatserver/guild.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chatserver/guild.h">
+		<Unit filename="src/net/manaserv/chatserver/guild.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chatserver/internal.cpp">
+		<Unit filename="src/net/manaserv/chatserver/internal.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chatserver/internal.h">
+		<Unit filename="src/net/manaserv/chatserver/internal.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chatserver/party.cpp">
+		<Unit filename="src/net/manaserv/chatserver/party.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/chatserver/party.h">
+		<Unit filename="src/net/manaserv/chatserver/party.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/connection.cpp">
+		<Unit filename="src/net/manaserv/connection.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/connection.h">
+		<Unit filename="src/net/manaserv/connection.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/effecthandler.cpp">
+		<Unit filename="src/net/manaserv/effecthandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/effecthandler.h">
+		<Unit filename="src/net/manaserv/effecthandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/gamehandler.cpp">
+		<Unit filename="src/net/manaserv/gamehandler.cpp">
 			<Option target="Unix Manaserv" />
 			<Option target="Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/gamehandler.h">
+		<Unit filename="src/net/manaserv/gamehandler.h">
 			<Option target="Unix Manaserv" />
 			<Option target="Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/gameserver/gameserver.cpp">
+		<Unit filename="src/net/manaserv/gameserver/gameserver.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/gameserver/gameserver.h">
+		<Unit filename="src/net/manaserv/gameserver/gameserver.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/gameserver/internal.cpp">
+		<Unit filename="src/net/manaserv/gameserver/internal.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/gameserver/internal.h">
+		<Unit filename="src/net/manaserv/gameserver/internal.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/gameserver/player.cpp">
+		<Unit filename="src/net/manaserv/gameserver/player.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/gameserver/player.h">
+		<Unit filename="src/net/manaserv/gameserver/player.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/generalhandler.cpp">
+		<Unit filename="src/net/manaserv/generalhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/generalhandler.h">
+		<Unit filename="src/net/manaserv/generalhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/guildhandler.cpp">
+		<Unit filename="src/net/manaserv/guildhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/guildhandler.h">
+		<Unit filename="src/net/manaserv/guildhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/internal.cpp">
+		<Unit filename="src/net/manaserv/internal.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/internal.h">
+		<Unit filename="src/net/manaserv/internal.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/inventoryhandler.cpp">
+		<Unit filename="src/net/manaserv/inventoryhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/inventoryhandler.h">
+		<Unit filename="src/net/manaserv/inventoryhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/itemhandler.cpp">
+		<Unit filename="src/net/manaserv/itemhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/itemhandler.h">
+		<Unit filename="src/net/manaserv/itemhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/loginhandler.cpp">
+		<Unit filename="src/net/manaserv/loginhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/loginhandler.h">
+		<Unit filename="src/net/manaserv/loginhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/network.cpp">
+		<Unit filename="src/net/manaserv/network.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/network.h">
+		<Unit filename="src/net/manaserv/network.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/npchandler.cpp">
+		<Unit filename="src/net/manaserv/npchandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/npchandler.h">
+		<Unit filename="src/net/manaserv/npchandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/partyhandler.cpp">
+		<Unit filename="src/net/manaserv/partyhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/partyhandler.h">
+		<Unit filename="src/net/manaserv/partyhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/playerhandler.cpp">
+		<Unit filename="src/net/manaserv/playerhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/playerhandler.h">
+		<Unit filename="src/net/manaserv/playerhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/protocol.h">
+		<Unit filename="src/net/manaserv/protocol.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/specialhandler.cpp">
+		<Unit filename="src/net/manaserv/specialhandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/specialhandler.h">
+		<Unit filename="src/net/manaserv/specialhandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/tradehandler.cpp">
+		<Unit filename="src/net/manaserv/tradehandler.cpp">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
-		<Unit filename="src/net/tmwserv/tradehandler.h">
+		<Unit filename="src/net/manaserv/tradehandler.h">
 			<Option target="Manaserv" />
 			<Option target="Unix Manaserv" />
 		</Unit>
@@ -948,7 +948,7 @@
 		<Unit filename="src/textparticle.cpp" />
 		<Unit filename="src/textparticle.h" />
 		<Unit filename="src/tileset.h" />
-		<Unit filename="src/tmw.rc">
+		<Unit filename="src/mana.rc">
 			<Option compilerVar="WINDRES" />
 			<Option target="eAthena" />
 			<Option target="Manaserv" />
diff --git a/mana.menu b/mana.menu
index 4af5ad0a..0243cf1c 100644
--- a/mana.menu
+++ b/mana.menu
@@ -1,4 +1,4 @@
-?package(tmw):needs="X11" section="Games/Adventure"\
- title="The Mana World"\
- description="The Mana World is an Online Fantasy adventure game."\
- command="/usr/games/tmw" icon="/usr/share/pixmaps/tmw.xpm"
+?package(mana):needs="X11" section="Games/Adventure"\
+ title="Mana"\
+ description="Mana is a 2D MMORPG client."\
+ command="/usr/games/mana" icon="/usr/share/pixmaps/mana.xpm"
diff --git a/packaging/debian/control b/packaging/debian/control
index 4372aaea..a5696ca5 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,37 +1,27 @@
-Source: tmw
+Source: mana
 Section: games
 Priority: optional
-Homepage: http://www.themanaworld.org/
+Homepage: http://manasource.org/
 Maintainer: Patrick Matthäi <patrick.matthaei@web.de>
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
-Package: tmw
+Package: mana
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tmw-data (= ${source:Version})
-Recommends: tmw-music
-Description: The Mana World is a great Online Rolegame
- based upon the Seiken Densetsu serie. It has its own universe, and its own
- character management system, which will give you the opportunity to play in a
- 2D heroic-fantasy world forever.
+Depends: ${shlibs:Depends}, ${misc:Depends}, mana-data (= ${source:Version})
+Description: Mana is a 2D MMORPG client
 
-Package: tmw-dbg
+Package: mana-dbg
 Architecture: any
 Priority: extra
-Depends: tmw (= ${binary:Version})
-Description: The Mana World is a great Online Rolegame (debugging symbols)
- based upon the Seiken Densetsu serie. It has its own universe, and its own
- character management system, which will give you the opportunity to play in a
- 2D heroic-fantasy world forever.
+Depends: mana (= ${binary:Version})
+Description: Mana is a 2D MMORPG client (debugging symbols)
  .
- This package provides debugging symbols for the tmw package.
+ This package provides debugging symbols for the mana package.
 
-Package: tmw-data
+Package: mana-data
 Architecture: all
-Recommends: tmw, tmw-music
-Description: The Mana World is a great Online Rolegame (data files)
- based upon the Seiken Densetsu serie. It has its own universe, and its own
- character management system, which will give you the opportunity to play in a
- 2D heroic-fantasy world forever.
+Recommends: mana
+Description: Mana is a 2D MMORPG client
  .
  This package contains the data files.
diff --git a/packaging/debian/mana.desktop b/packaging/debian/mana.desktop
index e97e4553..ec24a2fc 100644
--- a/packaging/debian/mana.desktop
+++ b/packaging/debian/mana.desktop
@@ -2,13 +2,13 @@
 [Desktop Entry]
 Version=1.0
 Name=Mana
-Name[fr]=Le Monde de Mana
-Comment=An online fantasy role playing game
+Comment=A 2D MMORPG client
 Comment[fr]=Un jeu en ligne dans un univers fantastique
 Comment[de]=ein Online Fantasy Spiel
 Comment[it]=Un gioco fantasy online
 Comment[nl]=Een online role playing game
-Exec=tmw
+Comment[sv]=Ett fantasyrollspel online
+Exec=mana
 StartupNotify=false
 Terminal=false
 Type=Game
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 614ee701..df2e08d6 100644
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -56,7 +56,7 @@ binary-arch: build install
 	dh_install -a
 	dh_desktop -a
 	dh_installmenu -a
-	dh_strip -a --dbg-package=tmw-dbg
+	dh_strip -a --dbg-package=mana-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
diff --git a/packaging/windows/make-translations.vbs b/packaging/windows/make-translations.vbs
index f349b25e..339a0299 100644
--- a/packaging/windows/make-translations.vbs
+++ b/packaging/windows/make-translations.vbs
@@ -29,7 +29,7 @@ do while not stream.AtEndOfStream
                 CreateFolderIfNonexistent("..\..\translations\" + s + "\LC_MESSAGES")
                 'build the translate command
                 infile = "../../po/" + s + ".po"
-                outfile = "../../translations/" + s +"/LC_MESSAGES/tmw.mo"
+                outfile = "../../translations/" + s +"/LC_MESSAGES/mana.mo"
                 command = "msgfmt -c -o " + outfile + " " + infile
                 'execute translate command
                 errval = WshShell.run(command, 0, true)
diff --git a/po/Makevars b/po/Makevars
index 76e72f50..7ea0d129 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = tmw
+DOMAIN = mana
 
 # These two variables depend on the location of this directory.
 subdir = po
diff --git a/src/game.cpp b/src/game.cpp
index 9bbf83bd..856288bc 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -407,7 +407,7 @@ static bool saveScreenshot()
         filenameSuffix.str("");
         filename << PHYSFS_getUserDir();
 #if (defined __USE_UNIX98 || defined __FreeBSD__)
-        filenameSuffix << ".tmw/";
+        filenameSuffix << ".mana/";
 #elif defined __APPLE__
         filenameSuffix << "Desktop/";
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 607c6205..8ecac127 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -288,7 +288,7 @@ static void setUpdatesDir()
 }
 
 /**
- * Initializes the home directory. On UNIX and FreeBSD, ~/.tmw is used. On
+ * Initializes the home directory. On UNIX and FreeBSD, ~/.mana is used. On
  * Windows and other systems we use the current working directory.
  */
 static void initHomeDir(const Options &options)
@@ -298,7 +298,7 @@ static void initHomeDir(const Options &options)
     if (homeDir.empty())
     {
 #ifdef __APPLE__
-        // Use Application Directory instead of .tmw
+        // Use Application Directory instead of .mana
         homeDir = std::string(PHYSFS_getUserDir()) +
             "/Library/Application Support/" +
             branding.getValue("appName", "Mana");
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 13c3cf45..0f93efb8 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -296,7 +296,7 @@ void CharServerHandler::connect()
     outMsg.writeInt32(token.session_ID1);
     outMsg.writeInt32(token.session_ID2);
     // [Fate] The next word is unused by the old char server, so we squeeze in
-    //        tmw client version information
+    //        mana client version information
     outMsg.writeInt16(CLIENT_PROTOCOL_VERSION);
     outMsg.writeInt8((token.sex == GENDER_MALE) ? 1 : 0);
 
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 0b2eefe2..d8dcb51c 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -164,7 +164,7 @@ void GeneralHandler::guiWindowsLoaded()
 {
     inventoryWindow->setSplitAllowed(true);
     partyWindow->clearPartyName();
-    skillDialog->loadSkills("tmw-skills.xml");
+    skillDialog->loadSkills("skills.xml");
     specialsWindow->loadSpecials("specials.xml");
 
     player_node->setExpNeeded(100);
diff --git a/src/tmw.rc b/src/tmw.rc
index 4902e07a..62dd9ec3 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -2,7 +2,7 @@
 
 #include "winver.h"
 
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/mana.ico"
 
 1 VERSIONINFO
 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
diff --git a/tools/tmxcopy/readme.txt b/tools/tmxcopy/readme.txt
index 52af1048..d130edd6 100644
--- a/tools/tmxcopy/readme.txt
+++ b/tools/tmxcopy/readme.txt
@@ -94,7 +94,7 @@ Blank tiles in the lower layer will be ignored (put a blank in the upper layer t
 
 The programs work so far but there are still some minor problems:
 
--Only tested for TMW-compilant maps. I don't guarantee that it works with Tiled maps that are made for other games and thus use different features.
+-Only tested for Mana-compilant maps. I don't guarantee that it works with Tiled maps that are made for other games and thus use different features.
 -Compressed maps (tmx.gz) can not be handled yet (but compressed or uncompressed layers work properly) 
 -When the target map has an object layer it is moved to the bottom of the layer list of the map (no problem for the game but inconvenient for editing). Objects on the source map are ignored. 
 -All tilesets included in the srcFile (TMXCopy) or template (TMXRandomFill and TMXCollide) will be added to the output file, even if they aren't needed for the tiles that are added.