Rebranding TME to Aethyra

48 files changed, 208 insertions, 178 deletions

diff --git a/AUTHORS b/AUTHORS
index a4181b7b..a876c194 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 ---------------------------
-The Mana Experiment Dev Team
+Aethyra Dev Team
 ---------------------------
 
  Blameu aka Kevin Day (blame582@gmail.com)
diff --git a/The Mana Experiment.dev b/Aethyra.dev
index 0a0acf8a..6bfb1bfa 100644
--- a/The Mana Experiment.dev
+++ b/Aethyra.dev
@@ -1,13 +1,13 @@
 [Project]
-FileName=The Mana Experiment.dev
-Name=tme
+FileName=Aethyra.dev
+Name=aethyra
 UnitCount=277
 Type=0
 Ver=1
 ObjFiles=
 Includes=
 Libs=
-PrivateResource=The_Mana_Experiment_private.rc
+PrivateResource=Aethyra_private.rc
 ResourceIncludes=
 MakeIncludes=
 Compiler=
@@ -18,7 +18,7 @@ Icon=
 ExeOutput=
 ObjectOutput=obj
 OverrideOutput=1
-OverrideOutputName=tme.exe
+OverrideOutputName=aethyra.exe
 HostApplication=
 Folders=gui,gui/header,gui/source,header,header/widgets,net,net/header,net/source,resources,utils
 CommandLine=
diff --git a/ManaExperiment.vcproj b/Aethyra.vcproj
index 6612e1a1..6612e1a1 100644
--- a/ManaExperiment.vcproj
+++ b/Aethyra.vcproj
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8181f6b4..df745a7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(TME)
+PROJECT(AETHYRA)
 
 SET(VERSION 0.0.24.1)
 
@@ -11,11 +11,11 @@ IF (WIN32)
     SET(PKG_DATADIR ".")
     SET(PKG_BINDIR ".")
 ELSE (WIN32)
-    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tme)
+    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/aethyra)
     SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
 ENDIF (WIN32)
 
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(src)
 
-INSTALL(FILES tme.desktop DESTINATION share/applications)
+INSTALL(FILES aethyra.desktop DESTINATION share/applications)
diff --git a/INSTALL b/INSTALL
index aeb81213..5688451b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,19 @@
-How to compile and run TME on your GNU/Linux Box
+How to compile and run Aethyra on your GNU/Linux Box
 ================================================
 
-Homepage:  http://209.168.213.109/
-IRC:       irc.freenode.net / #themanaexperiment
+Homepage:  http://www.aethyra.com/
+IRC:       irc.freenode.net / #aethyra
 
 1) Requirements
-2) Compiling The Mana Experiment
+2) Compiling Aethyra
 3) Notes
 
 
 1. Requirements
 ===============
 
-You are expected to have either checked out TME from CVS or you have downloaded
-a source release. To get The Mana Experiment to compile, you need a compiler
+You are expected to have either checked out Aethyra from CVS or you have downloaded
+a source release. To get Aethyra to compile, you need a compiler
 (GCC) and some libraries. The required libraries are:
 
 * SDL               http://www.libsdl.org/
@@ -26,7 +26,7 @@ a source release. To get The Mana Experiment to compile, you need a compiler
 * zlib 1.2.x        http://www.gzip.org/zlib/
 * libcurl           http://curl.haxx.se/libcurl/
 
-If you checked TME out from Subversion you will also need these tools to
+If you checked Aethyra out from Subversion you will also need these tools to
 compile:
 
 * GNU automake 1.9  http://www.gnu.org/software/automake/
@@ -36,7 +36,7 @@ Installing these dependencies is distributions-specific, and we'll leave it to
 you to figure this out.
 
 
-2. Compiling And Installing The Mana Experiment
+2. Compiling And Installing Aethyra
 ===============================================
 
 1) Go to the directory you have extracted the source to.
@@ -45,12 +45,12 @@ you to figure this out.
 4) Run "make"
 5) Run "make install" as root
 
-It should have installed The Mana Experiment on your system now, and you can
-run it with "tme". By default all files are installed to /usr/local, you can
+It should have installed Aethyra on your system now, and you can
+run it with "aethyra". By default all files are installed to /usr/local, you can
 pass a different prefix to configure as usual.
 
 
-  NOTE: It is possible to compile TME without support for OpenGL rendering.
+  NOTE: It is possible to compile Aethyra without support for OpenGL rendering.
   To do this perform step 3 as follows:
 
     ./configure --without-opengl
diff --git a/Makefile.am b/Makefile.am
index c7f45241..f399eb3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = data docs src
 
 desktopdir = $(datadir)/applications
 
-desktop_DATA = tme.desktop
+desktop_DATA = aethyra.desktop
 
 # Extra files to include
 EXTRA_DIST = $(desktop_DATA)
diff --git a/README b/README
index 88da7d97..517b4a9d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-THE MANA EXPERIMENT
+AETHYRA
 ===================
 
  Version: 0.0.24.1    Date: 7/4/2007
diff --git a/tme.cbp b/aethyra.cbp
index e51141a2..bcd0398b 100644
--- a/tme.cbp
+++ b/aethyra.cbp
@@ -2,12 +2,12 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="The Mana Experiment" />
+		<Option title="Aethyra" />
 		<Option pch_mode="0" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="default">
-				<Option output="tme.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="aethyra.exe" prefix_auto="0" extension_auto="0" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="0" />
@@ -37,7 +37,7 @@
 			</Target>
 			<Target title="unix">
 				<Option platforms="Unix;" />
-				<Option output="tme" prefix_auto="1" extension_auto="1" />
+				<Option output="aethyra" prefix_auto="1" extension_auto="1" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -358,7 +358,7 @@
 		<Unit filename="src/textparticle.cpp" />
 		<Unit filename="src/textparticle.h" />
 		<Unit filename="src/tileset.h" />
-		<Unit filename="src/tme.rc">
+		<Unit filename="src/aethyra.rc">
 			<Option compilerVar="WINDRES" />
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
diff --git a/tme.desktop b/aethyra.desktop
index cff8d732..eb75b5cf 100644
--- a/tme.desktop
+++ b/aethyra.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
-Name=The Mana Experiment
-Name[fr]=L'expérimentation de Mana
+Name=Aethyra
+Name[fr]=Aethyra
 Comment=An on-line fantasy role playing game
 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=tme
+Exec=aethyra
 StartupNotify=false
 Terminal=false
 Type=Application
-Icon=tmw.png
+Icon=aethyra.png
 Categories=Application;Game
diff --git a/data/icons/tme.png b/aethyra.png
index 93e6c9ae..93e6c9ae 100644
--- a/data/icons/tme.png
+++ b/aethyra.png
diff --git a/configure.ac b/configure.ac
index dcc1eeeb..92672b8b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([The Mana Experiment], [Tme SVN 0.0.25], [blame582@gmail.com], [tme])
+AC_INIT([Aethyra], [Aethyra SVN 0.0.25], [blame582@gmail.com], [aethyra])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
 
@@ -79,7 +79,7 @@ else
     with_opengl=yes
     AC_CHECK_LIB([GL], [glBegin], ,
     AC_MSG_ERROR([ *** Unable to find OpenGL library]))
-    AC_DEFINE(USE_OPENGL, 1, [Defines if tme should use an OpenGL display])
+    AC_DEFINE(USE_OPENGL, 1, [Defines if aethyra should use an OpenGL display])
 fi
 
 # Search for sdl-config
diff --git a/data/Makefile.am b/data/Makefile.am
index 86ae612d..508e6e0e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
 
 SUBDIRS = graphics help icons
 
-tmedatadir = $(pkgdatadir)/data
+aethyradatadir = $(pkgdatadir)/data
diff --git a/data/icons/The Mana Experiment.icns b/data/icons/Aethyra.icns
index 7230a099..7230a099 100644
--- a/data/icons/The Mana Experiment.icns
+++ b/data/icons/Aethyra.icns
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 5d7adee9..fee51e4f 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,14 +1,14 @@
 
 iconsdir = $(pkgdatadir)/data/icons
 
-icons_DATA = tme.png
+icons_DATA = aethyra.png
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL) $(srcdir)/tme.png $(DESTDIR)$(datadir)/pixmaps/tme.png
+	$(INSTALL) $(srcdir)/aethyra.png $(DESTDIR)$(datadir)/pixmaps/aethyra.png
 
 uninstall-local:
-	rm -f $(DESTDIR)$(datadir)/pixmaps/tme.png
+	rm -f $(DESTDIR)$(datadir)/pixmaps/aethyra.png
 
 EXTRA_DIST =		\
 	$(icons_DATA)
diff --git a/data/icons/tme.ico b/data/icons/aethyra.ico
index 61d559a3..61d559a3 100644
--- a/data/icons/tme.ico
+++ b/data/icons/aethyra.ico
diff --git a/data/icons/aethyra.png b/data/icons/aethyra.png
new file mode 100644
index 00000000..93e6c9ae
--- /dev/null
+++ b/data/icons/aethyra.png
diff --git a/data/icons/tme.xpm b/data/icons/aethyra.xpm
index 06ec2865..06ec2865 100644
--- a/data/icons/tme.xpm
+++ b/data/icons/aethyra.xpm
diff --git a/debian/aethyra-data.install b/debian/aethyra-data.install
new file mode 100644
index 00000000..007bcf7b
--- /dev/null
+++ b/debian/aethyra-data.install
@@ -0,0 +1,5 @@
+data/graphics/gui/*.png usr/share/games/aethyra/data/graphics/gui
+data/graphics/images/*.png usr/share/games/aethyra/data/graphics/images
+data/graphics/images/ambient/*.png usr/share/games/aethyra/data/graphics/images/ambient
+data/graphics/tiles/*.png usr/share/games/aethyra/data/graphics/tiles
+data/help/*.txt usr/share/games/aethyra/data/help
diff --git a/debian/tme.docs b/debian/aethyra.docs
index d622a527..d622a527 100644
--- a/debian/tme.docs
+++ b/debian/aethyra.docs
diff --git a/debian/aethyra.install b/debian/aethyra.install
new file mode 100644
index 00000000..66ba5126
--- /dev/null
+++ b/debian/aethyra.install
@@ -0,0 +1,5 @@
+debian/aethyra.desktop usr/share/applications
+debian/aethyra.xpm usr/share/pixmaps
+data/icons/aethyra.png usr/share/icons
+docs/aethyra.6 usr/share/man/man6
+src/aethyra usr/games
diff --git a/debian/tme.menu b/debian/aethyra.menu
index 4af5ad0a..4af5ad0a 100644
--- a/debian/tme.menu
+++ b/debian/aethyra.menu
diff --git a/debian/tme.sgml b/debian/aethyra.sgml
index 0ed18199..0ed18199 100644
--- a/debian/tme.sgml
+++ b/debian/aethyra.sgml
diff --git a/debian/tme.xpm b/debian/aethyra.xpm
index e7c2222a..a3ab9513 100644
--- a/debian/tme.xpm
+++ b/debian/aethyra.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * tme_xpm[] = {
+static char * aethyra_xpm[] = {
 "32 32 741 2",
 "	c None",
 ".	c #E8ED72",
diff --git a/debian/control b/debian/control
index 2a77f351..4ada3be5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,36 +1,36 @@
-Source: tmw
+Source: aethyra
 Section: games
 Priority: optional
-Homepage: http://209.168.213.109
-Maintainer: Patrick Matthäi <patrick.matthaei@web.de>
+Homepage: http://www.aethyra.com/
+Maintainer: Patrick Matthäi <patrick.matthaei@web.de> (Patrick is TMW maintainer need to change this)
 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: tme
+Package: aethyra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tme-data (= ${source:Version})
-Recommends: tme-music
-Description: The Mana Experiment is a great Online Rolegame
- based upon the Seiken Densetsu serie. It has its own universe, and its own
+Depends: ${shlibs:Depends}, ${misc:Depends}, aethyra-data (= ${source:Version})
+Recommends: aethyra-music
+Description: Aethyra is a great Online Rolegame
+ based upon The Mana World 0.0 codebase. 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.
 
-Package: tmw-dbg
+Package: aethyra-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
+Depends: aethyra (= ${binary:Version})
+Description: Aethyra is a great Online Rolegame (debugging symbols)
+ based upon the The Mana World 0.0 codebase. 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.
  .
  This package provides debugging symbols for the tmw package.
 
-Package: tmw-data
+Package: aethyra-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
+Recommends: aethyra, aethyra-music
+Description: Aethyra is a great Online Rolegame (data files)
+ based upon The Mana World 0.0 codebase. 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.
  .
diff --git a/debian/rules b/debian/rules
index 68dd9400..6ee08a3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ binary-arch: build install
 	dh_install -a
 	dh_desktop -a
 	dh_installmenu -a
-	dh_strip -a --dbg-package=tme-dbg
+	dh_strip -a --dbg-package=aethyra-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
diff --git a/debian/tme-data.install b/debian/tme-data.install
deleted file mode 100644
index a836ce3d..00000000
--- a/debian/tme-data.install
+++ /dev/null
@@ -1,5 +0,0 @@
-data/graphics/gui/*.png usr/share/games/tme/data/graphics/gui
-data/graphics/images/*.png usr/share/games/tme/data/graphics/images
-data/graphics/images/ambient/*.png usr/share/games/tme/data/graphics/images/ambient
-data/graphics/tiles/*.png usr/share/games/tme/data/graphics/tiles
-data/help/*.txt usr/share/games/tme/data/help
diff --git a/debian/tme.install b/debian/tme.install
deleted file mode 100644
index 6c9ced58..00000000
--- a/debian/tme.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tme.desktop usr/share/applications
-debian/tme.xpm usr/share/pixmaps
-data/icons/tme.png usr/share/icons
-docs/tme.6 usr/share/man/man6
-src/tme usr/games
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index db3eb491..b52c0f17 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -7,10 +7,10 @@ Q: How to get help?
 
 A: The fastest way is to come on our IRC channel. There you can find a lot of
    nice people that will help you until you solve your problem. Server:
-   irc.freenode.net Channel: #themanaexperiment.
+   irc.freenode.net Channel: #aethyra.
    If you don't like IRC just come to our forums:
-   http://tme.onlinegamecore.com/forums. Ok, do you think forums are evil?
-   Don't worry, send me an e-mail at elvenprogrammer@gmail.com and you're done.
+   http://forums.aethyra.com/ . Ok, do you think forums are evil?
+   Don't worry, send me an e-mail at blame582@gmail.com and you're done.
    That's not enough? No, I won't give you my phone number! ;P
    
 GAME
@@ -21,7 +21,7 @@ A: First of all check that your username is at least 4 characters long. Is the
    first time you login? Have you registered an account? If not use the
    "Register" button in game. If you already succesfully connected before, but
    now you're getting this message, please send an e-mail to
-   elvenprogrammer@gmail.com.
+   blame582@gmail.com.
 
 
 Q: I always get "Wrong password" but I'm sure I typed it right, why?
@@ -52,13 +52,15 @@ A: It's a system where is stored the latest development version. It's not
    is updated quite frequently). If you want to check it out, read this guide
    http://themanaworld.org/svn-tutorial.txt 
 
+(We need our own svn tut -- kraant)
+
 
 DEVELOPMENT
 
 Q: When will the next version be released?
 
 A: We have scheduled releases. Usually a new release is available every month.
-   Check http://wiki.themanaworld.org/index.php/Roadmap for further infos.
+   Check http://www.aethyra.com/ for further info.
 
 
 Q: How can I contribute?
@@ -67,11 +69,11 @@ A: There are a lot of ways:
    
    - If you're a programmer, an artist or just willing to help in any way, you
      can become part of the development team. Send an e-mail to
-     elvenprogrammer@gmail.com explaining what you want to do, or join our irc
-     channel: #themanaexperiment @ irc.freenode.net.
+     blame582@gmail.com explaining what you want to do, or join our irc
+     channel: #aethyra @ irc.freenode.net.
    
-   - You can be a beta tester. Just play with The Mana Experiment and report
+   - You can be a beta tester. Just play with Aethyra and report
      every error on the forum.
    
-   - Play with The Mana Experiment: more players, more fun! Simple as that! ;-)
+   - Play with Aethyra: more players, more fun! Simple as that! ;-)
 
diff --git a/docs/HACKING.txt b/docs/HACKING.txt
index fdec32a6..85ad0d8c 100644
--- a/docs/HACKING.txt
+++ b/docs/HACKING.txt
@@ -1,5 +1,5 @@
 ---------------------------------
-The Mana Experiment Hacking Guide
+Aethyra Hacking Guide
 ---------------------------------
 
 With multiple coders working on the same source files, there needs to be a
diff --git a/docs/INSTALL/debian.txt b/docs/INSTALL/debian.txt
index 59e2376e..e9cf3183 100644
--- a/docs/INSTALL/debian.txt
+++ b/docs/INSTALL/debian.txt
@@ -1,31 +1,43 @@
-How to install TME on my GNU/Debian Box
+How to install Aethyra on my GNU/Debian Box
 ==================================================
 
 Author:   FERREIRA Yohann (Bertram)
 Email:    Bertram@cegetel.net
 
-The Mana Experiment project
+With slight edits by Daniel Thomas (kraant@gmail.com)
+to for Aethyra...
+
+WARNING! These instructions are probably outdated!
+
+Check the forums (http://forums.aethyra.com/) where better help can be found.
+
+Aethyra project
 ======================
-Homepage: http://209.168.213.109/
-IRC:      irc.freenode.net / #themanaexperiment
+Homepage: http://www.aethyra.com/
+IRC:      irc.freenode.net / #aethyra
 
-1) Installing The Mana Experiment and dependencies
+1) Installing Aethyra and dependencies
 2) Creating a Debian Package using DebHelper Tools
 3) Notes
 
 
-1. Installing The Mana Experiment and Dependencies
+1. Installing Aethyra and Dependencies
 =============================================
 
-The Mana Experiment Debian Package can be installed under the Debian Testing and
+Aethyra Debian Package can be installed under the Debian Testing and
 Unstable (Sarge/Sid). In order to have Mana Experiment working, you'll need
 packages for SDL, SDL_mixer, SDL_image, libxml2, libphysfs and libguichan0.
 
 To install the dependencies, you can do type (as root):
 
-    apt-get install libsdl-mixer1.2 libsdl-image1.2 libxml2 libphysfs-1.0-0 libguichan0
+    apt-get install libsdl-mixer1.2 libsdl-image1.2 libxml2 libphysfs-1.0-0
 
-Type tmw as a normal user to play! (Enjoy!)
+(You'll need to compile libguichan from source since we've moved to 8.1
+and there is no package for this as of yet. This could create
+problems, any debian users trying this out and giving us fixes
+would be much appreciated -- kraant)
+
+Type aethyra as a normal user to play! (Enjoy!)
 
 2. Creating a Debian Package using DebHelper Tools
 ==================================================
@@ -41,9 +53,9 @@ And the debhelper tools:
 Download tmw from Subversion using the command (You'll need Subversion
 installed on your system):
 
-   svn svn://209.168.213.109 tme
+   svn co svn://209.168.213.109/client/trunk aethyra
 
-Rename the tme folder into tme-XXX and open a console in it.
+Rename the aethyra folder into aethyra-XXX and open a console in it.
 You can now type:
 
     fakeroot dpkg-buildpackage
@@ -53,16 +65,16 @@ file.
 
 Install it:
 
-    dpkg -i tme_XXXXXX_i386.deb
+    dpkg -i aethyra_XXXXXX_i386.deb
 
 (If you've got a previous one already installed with the same version number,
 don't forget to remove it with :)
 
-    apt-get remove tme
+    apt-get remove aethyra
 
 (Don't worry, you configuration files are not removed...)
 
-And now the final step: type 'tme' as a normal user in a shell and you're in!
+And now the final step: type 'aethyra' as a normal user in a shell and you're in!
 
 KDE/GNOME menu entries are created in Arcade Games upon installation.
 
@@ -71,6 +83,10 @@ KDE/GNOME menu entries are created in Arcade Games upon installation.
 
 A Debian Repository has been created.
 
+(This repository is for The Mana World not Aethyra, volunteers to make a
+package would be nice, basically if you follow these instructions 
+you won't get aethyra as of now -- kraant)
+
 Simply add in your /etc/apt/sources.list file:
 
     deb http://bertram.ifrance.com ./
@@ -79,9 +95,11 @@ Simply add in your /etc/apt/sources.list file:
 Then, as root, do:
 
     apt-get update
-    apt-get install tme
+    apt-get install aethyra
 
 and you're done!
 
-N.B.: The tme-music, libguichan0, and libguichan0-dev packages are also
+N.B.: The t_me-music, libguichan0, and libguichan0-dev packages are also
 provided in this repository.
+
+(Added '_' to avoid picking this file up in grep, fix this later -- kraant)
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index 88f47034..3ffd506e 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -1,10 +1,12 @@
-How setup Dev-C++ to compile TME on a Win32 Box
+How setup Dev-C++ to compile Aethyra on a Win32 Box
 ===============================================
 
-The Mana Experiment project
+(I think Dev-C++ support is broken as of now -- kraant)
+
+Aethyra project
 ===========================
-Homepage: http://209.168.213.109
-IRC:      irc.freenode.net / #themanaexperiment
+Homepage: http://www.aethyra.com
+IRC:      irc.freenode.net / #aethyra
 
 
 0. Index
@@ -12,7 +14,7 @@ IRC:      irc.freenode.net / #themanaexperiment
 1. Requirements
 2. Installing Dev-C++
 3. Installing the required libraries
-4. Compiling The Mana Experiment
+4. Compiling Aethyra
 
 
 1. Requirements
@@ -23,7 +25,7 @@ free IDE for Win32 built around GCC. Remember, Win32 was not meant for GCC and
 stuff so you will probably run into trouble unless you really know what you're
 doing, so best stick with Dev-C++.
 
-Besides a C++ compiler, TME depends on the following libraries:
+Besides a C++ compiler, Aethyra depends on the following libraries:
 
 1) SDL
 2) SDL_mixer
@@ -95,22 +97,22 @@ Install them all through the Dev-C++ package manager.
         iconv-1.9.1.win32.zip
 
      From each file, copy the headers to your include directory, the libs to
-     the lib direcotry and the dlls (in bin direcotry) to your tme directory.
+     the lib direcotry and the dlls (in bin direcotry) to your aethyra directory.
 
 **) For PhysFS copy the headers to your include directory, the libs to
-    the lib directory and the dlls (in bin direcotry) to your tme directory.
+    the lib directory and the dlls (in bin direcotry) to your aethyra directory.
 
 ***) Download developer files and put headers and libs in to include and lib
-     directories of Dev-Cpp. Download binaries and place the dll inside tme
+     directories of Dev-Cpp. Download binaries and place the dll inside aethyra
      folder.
 
 ****) Get latest win32 - mingw package and install as usual.
 
-You should now be fully equipped for compiling the latest TME development
+You should now be fully equipped for compiling the latest Aethyra development
 code!
 
 
-4. Compiling The Mana Experiment
+4. Compiling Aethyra
 ================================
 
 Check out The Mana Experiment from Subversion using either the command line svn
@@ -119,12 +121,12 @@ check out the following directory from our repository:
 
   svn://209.168.213.109/client/trunk
 
-Open "The Mana Experiment.dev" in Dev-C++. From there on you should be able to
-start compilition with Excute -> Compile. A file called tme.exe should appear
+Open "Aethyra.dev" in Dev-C++. From there on you should be able to
+start compilition with Excute -> Compile. A file called aethyra.exe should appear
 in the same directory as where you opened the .dev from.
 
 Before you can actually run the executable be sure to copy over the following
-DLLs from your Dev-Cpp/dll directory to the directory containing tme.exe (or 
+DLLs from your Dev-Cpp/dll directory to the directory containing aethyra.exe (or 
 alternatively into your c:\windows\system\ for a more universal solution):
 
  SDL.dll
@@ -143,7 +145,7 @@ And also make sure you have:
  zlib1.dll
 
 Additionally don't forget to copy any updated .dll (when libs are updated,
-the dll are usually updated too) to the folder containing tme.exe (or to the
+the dll are usually updated too) to the folder containing aethyra.exe (or to the
 c:\windows\system\).
 
-Have fun hacking The Mana Experiment!
+Have fun hacking Aethyra!
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 4ea96959..8b311f85 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,11 +1,11 @@
-man6_MANS = tme.6
+man6_MANS = aethyra.6
 
 EXTRA_DIST = $(man6_MANS) \
 	     packages.txt \
 	     FAQ.txt \
 	     HACKING.txt \
-	     SOURCE/tmedox.sh \
-	     SOURCE/tme.doxcfg \
+	     SOURCE/aethyradox.sh \
+	     SOURCE/aethyra.doxcfg \
 	     items.txt \
 	     progression.txt \
 	     INSTALL/debian.txt \
diff --git a/docs/SOURCE/tme.doxcfg b/docs/SOURCE/aethyra.doxcfg
index f3f90af9..cbc22910 100644
--- a/docs/SOURCE/tme.doxcfg
+++ b/docs/SOURCE/aethyra.doxcfg
@@ -17,7 +17,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = The Mana Experiment
+PROJECT_NAME           = Aethyra
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
@@ -625,7 +625,7 @@ GENERATE_HTMLHELP      = NO
 # can add a path in front of the file if the result should not be
 # written to the html output directory.
 
-CHM_FILE               = tme.chm
+CHM_FILE               = aethyra.chm
 
 # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
 # be used to specify the location (absolute path including file name) of
diff --git a/docs/SOURCE/aethyradox.sh b/docs/SOURCE/aethyradox.sh
new file mode 100644
index 00000000..e0f299a8
--- /dev/null
+++ b/docs/SOURCE/aethyradox.sh
@@ -0,0 +1 @@
+cd ../../src/ && doxygen ../docs/SOURCE/aethyra.doxcfg
diff --git a/docs/SOURCE/tmedox.sh b/docs/SOURCE/tmedox.sh
deleted file mode 100644
index 7ab9ea74..00000000
--- a/docs/SOURCE/tmedox.sh
+++ /dev/null
@@ -1 +0,0 @@
-cd ../../src/ && doxygen ../docs/SOURCE/tme.doxcfg
diff --git a/docs/tme.6 b/docs/aethyra.6
index f4fe85cf..a130a3a5 100644
--- a/docs/tme.6
+++ b/docs/aethyra.6
@@ -1,13 +1,13 @@
-.TH "TME" "6"
+.TH "AETHYRA" "6"
 .SH "NAME"
-tme \- tme is The Mana Experiment: A fantasy online game
+aethyra \- aethyra is Aethyra: A fantasy online game
 .SH "SYNOPSIS"
-\fBtme\fR
+\fBaethyra\fR
 .SH "DESCRIPTION"
 This manual page documents briefly the
-\fBtme\fR ingame
+\fBaethyra\fR ingame
 commands.
-\fBtme\fR is a great online game based upon the Seiken Densetsu Serie.
+\fBaethyra\fR is a great online game based upon the Seiken Densetsu Serie.
 It has its own universe, and and its own character management system, which will
 give you the opportunity to play in a 2D heroic-fantasy world forever.
 .SH "BINARY PARAMETERS"
@@ -91,7 +91,7 @@ Displays / Hides debug window.
 This manual page was written by Patrick Matth\[:a]i <patrick.matthaei@web.de>
 for The Mana World project.
 With slight alterations by Daniel Thomas\[:a]i <kraant@gmail.com>,
-for The Mana Experiment.
+for Aethyra.
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU General Public License, Version 2 any
 later version published by the Free Software Foundation.
diff --git a/docs/packages.txt b/docs/packages.txt
index 46c35f51..d5735e28 100644
--- a/docs/packages.txt
+++ b/docs/packages.txt
@@ -1,5 +1,5 @@
 ----------------------------------
-THE MANA EXPERIMENT PACKAGE SYSTEM
+AETHYRA PACKAGE SYSTEM
 ----------------------------------
 
 1. INTRODUCTION
@@ -10,41 +10,46 @@ THE MANA EXPERIMENT PACKAGE SYSTEM
 6. LOADING A REQUESTED RESOURCE
 7. RESOURCE MANAGEMENT DETAILS
 
+(Note this file is a _little_ outdated in some ways -- kraant)
+
 
 1. INTRODUCTION
 
-The Mana Experiment is expected to grow continuously with updates to the game
+Aethyra (Was The Mana Experiment, original;y The Mana World) is expected to grow continuously with updates to the game
 world occurring relatively frequently. More often so than for example new
 releases of the game client. To make sure players don't have to update their
 data manually all the time, by for example downloading the latest from the
-website, the TME client should be able to automatically obtain new data
+website, the Aethyra client should be able to automatically obtain new data
 packages from the server.
 
  Note: To reduce the load on the server (which isn't expected to have huge
  free uploading resources), the idea is that the server will only send a
  torrent file to the client and that the file is subsequently downloaded from
- several locations that have volunteered to spread TME data files. Ultimately
+ several locations that have volunteered to spread Aethyra data files. Ultimately
  a simple option on the client will even allow players to contribute their
  excess bandwidth to help other players get the updates faster.
 
+(This doesn't seem to have occurred we're still using http all the way
+up to now even into Aethyra)
+
 
 2. LOCATION OF DATA
 
-There are two locations where TME can look for game data. The install data
+There are two locations where Aethyra can look for game data. The install data
 directory and the data directory in the user's home directory. The latter one
 doesn't have to be used for Windows users, but is required for dynamic updates
 for UNIX users, who generally won't have write permissions to the install
 data directory. So for UNIX the two locations are:
 
- /usr/local/share/tme/data/*
+ /usr/local/share/aethyra/data/*
 
- ~/.tme/updates/*
+ ~/.aethyra/updates/*
 
- ~/.tme/customdata
+ ~/.aethyra/customdata
 
 While for Windows all the data will be located at:
 
- C:\Program Files\The Mana Experiment\data\*
+ C:\Program Files\Aethyra\data\*
 
 In the UNIX case it doesn't matter in which order the data directories are
 examined.
@@ -85,7 +90,7 @@ package is irrelevant. An example of the contents is given by:
 
 5. INITIALIZING PACKAGE MANAGEMENT
 
-When TME starts it will scan its data directories for both packages (archives)
+When Aethyra starts it will scan its data directories for both packages (archives)
 and directories. When a directory is found with the same name as a package, the
 directory is the preferred location to load data from as it is assumed to be
 more up to date.
@@ -129,7 +134,7 @@ The resource management technique is critical to the overall success of the
 package management system as a whole.  Resources are loaded at runtime as they
 are needed, and unloaded as they become unused.  In order to ensure the 
 autonomous functioning of this process reference counting is the agreed upon 
-technique for managing loaded resources in TME.  
+technique for managing loaded resources in Aethyra.  
 
 For those unfamiliar with the practice of reference counting, it involves 
 every resource object having a variable containing the number of references to
diff --git a/docs/sounddev.txt b/docs/sounddev.txt
index ed2ae71e..1c83157a 100644
--- a/docs/sounddev.txt
+++ b/docs/sounddev.txt
@@ -1,5 +1,5 @@
 -------------------------------------
-THE MANA EXPERIMENT SOUND DEVELOPMENT
+AETHYRA SOUND DEVELOPMENT
 -------------------------------------
 
 1. INTRODUCTION
@@ -9,7 +9,7 @@ THE MANA EXPERIMENT SOUND DEVELOPMENT
 
 1. INTRODUCTION
 
-In The Mana Experiment we plan to have both background music and sound effects
+In Aethyra we plan to have both background music and sound effects
 linked to beings actions.
 
 2. SPECS
diff --git a/docs/win32-release.txt b/docs/win32-release.txt
index 1c0577df..64590139 100644
--- a/docs/win32-release.txt
+++ b/docs/win32-release.txt
@@ -1,5 +1,5 @@
 -------------------------------------------
-THE MANA EXPERIMENT WIN32 RELEASE CHECKLIST
+AETHYRA WIN32 RELEASE CHECKLIST
 -------------------------------------------
 
 Every Win32 releaser should follow this checklist when creating a new package.
@@ -11,7 +11,10 @@ Every Win32 releaser should follow this checklist when creating a new package.
     * Eventually Legal Copyright
 - Update README and ChangeLog if not already
 - Compile OpenGL version (Using -DUSE_OPENGL option) and rename the executable
-  from tme.exe to tme_opengl.exe
+  from aethyra.exe to aethyra_opengl.exe
+ (This isn't actually how it's happening because I'm cross compiling
+  and therefore flying blind. As it is aethyra.exe is the OpenGL version
+  and no sdl version is generated -- kraant)
 - Compile normal version (Do not use special flags as __DEBUG or USE_OPENGL)
 - Check if the dlls were compressed (SDL.dll, SDL_Image.dll, SDL_Mixer.dll)
 - Check config.xml for default values:
@@ -19,7 +22,7 @@ Every Win32 releaser should follow this checklist when creating a new package.
       <configuration>
         <option name="chatlog" value="chatlog.txt"/>
         <option name="guialpha" value="0.8"/>
-        <option name="host" value="server.themanaworld.org"/>
+        <option name="host" value="209.168.213.109"/>
         <option name="hwaccel" value="0"/>
         <option name="port" value="6901"/>
         <option name="remember" value="0"/>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7dcbc7a..e6ee7405 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ FIND_PACKAGE(PhysFS REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 
 SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"")
-SET(FLAGS "${FLAGS} -DTME_DATADIR=\\\"${PKG_DATADIR}/\\\"")
+SET(FLAGS "${FLAGS} -DAETHYRA_DATADIR=\\\"${PKG_DATADIR}/\\\"")
 
 SET(GUICHAN_COMPONENTS "SDL")
 IF (WITH_OPENGL)
@@ -339,9 +339,9 @@ SET(SRCS
     vector.h
     )
 
-ADD_EXECUTABLE(tme ${SRCS})
+ADD_EXECUTABLE(aethyra ${SRCS})
 
-TARGET_LINK_LIBRARIES(tme
+TARGET_LINK_LIBRARIES(aethyra
     ${SDL_LIBRARY}
     ${SDLIMAGE_LIBRARY}
     ${SDLMIXER_LIBRARY}
@@ -354,6 +354,6 @@ TARGET_LINK_LIBRARIES(tme
     ${OPENGL_LIBRARIES}
     )
 
-INSTALL(TARGETS tme RUNTIME DESTINATION ${PKG_BINDIR})
+INSTALL(TARGETS aethyra RUNTIME DESTINATION ${PKG_BINDIR})
 
-SET_TARGET_PROPERTIES(tme PROPERTIES COMPILE_FLAGS "${FLAGS}")
+SET_TARGET_PROPERTIES(aethyra PROPERTIES COMPILE_FLAGS "${FLAGS}")
diff --git a/src/Makefile.am b/src/Makefile.am
index e750e214..7cd233b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-bin_PROGRAMS = tme
-tme_SOURCES = gui/widgets/dropdown.cpp \
+bin_PROGRAMS = aethyra
+aethyra_SOURCES = gui/widgets/dropdown.cpp \
               gui/widgets/dropdown.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
@@ -311,10 +311,10 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 # set the include path found by configure
 INCLUDES =					\
 	$(all_includes)				\
-	-DTME_DATADIR=\""$(pkgdatadir)/"\"
+	-DAETHYRA_DATADIR=\""$(pkgdatadir)/"\"
 
 # the library search path.
-tme_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
-tme_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS)
-tme_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS)
-tme_TARGET = tme
+aethyra_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
+aethyra_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS)
+aethyra_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS)
+aethyra_TARGET = aethyra
diff --git a/src/tme.rc b/src/aethyra.rc
index 495d0675..f35c547d 100644
--- a/src/tme.rc
+++ b/src/aethyra.rc
@@ -2,7 +2,7 @@
 

 #include "winver.h"

 

-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tme.ico"

+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/aethyra.ico"

 

 1 VERSIONINFO

 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD

@@ -10,12 +10,12 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
 FILETYPE VFT_APP {

     BLOCK "StringFileInfo" {

         BLOCK "040904E4" {

-            VALUE "CompanyName", "The Mana Experiment Development Team"

+            VALUE "CompanyName", "Aethyra Development Team"

             VALUE "FileVersion", PACKAGE_VERSION

-            VALUE "FileDescription", "The Mana Experiment"

+            VALUE "FileDescription", "Aethyra Experiment"

             VALUE "LegalCopyright", "2008 (C)"

-            VALUE "OriginalFilename", "tme.exe"

-            VALUE "ProductName", "The Mana Experiment MMORPG"

+            VALUE "OriginalFilename", "aethyra.exe"

+            VALUE "ProductName", "Aethyra MMORPG"

             VALUE "ProductVersion", PACKAGE_VERSION

         }

     }

diff --git a/src/game.cpp b/src/game.cpp
index 2522c6e5..261fa157 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -357,11 +357,11 @@ bool saveScreenshot(SDL_Surface *screenshot)
     screenshotCount++;
     filename.str("");
 #if (defined __USE_UNIX98 || defined __FreeBSD__)
-    filename << PHYSFS_getUserDir() << ".tme/";
+    filename << PHYSFS_getUserDir() << ".aethyra/";
 #elif defined __APPLE__
     filename << PHYSFS_getUserDir() << "Desktop/";
 #endif
-    filename << "TMW_Screenshot_" << screenshotCount << ".png";
+    filename << "Aethyra_Screenshot_" << screenshotCount << ".png";
     testExists.open(filename.str().c_str(), std::ios::in);
     found = !testExists.is_open();
     testExists.close();
diff --git a/src/main.cpp b/src/main.cpp
index cc30ec0a..92e18906 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -198,18 +198,18 @@ void setUpdatesDir()
  */
 void init_engine(const Options &options)
 {
-    homeDir = std::string(PHYSFS_getUserDir()) + "/.tme";
+    homeDir = std::string(PHYSFS_getUserDir()) + "/.aethyra";
 #if defined WIN32
     if (!CreateDirectory(homeDir.c_str(), 0) &&
             GetLastError() != ERROR_ALREADY_EXISTS)
 #elif defined __APPLE__
-    // Use Application Directory instead of .tme
+    // Use Application Directory instead of .aethyra
     homeDir = std::string(PHYSFS_getUserDir()) +
-        "/Library/Application Support/The Mana Experiment";
+        "/Library/Application Support/Aethyra";
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #else
-    // Checking if /home/user/.tme folder exists.
+    // Checking if /home/user/.Aethyra folder exists.
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #endif
@@ -221,12 +221,12 @@ void init_engine(const Options &options)
     }
 
     // Set log file
-    logger->setLogFile(homeDir + std::string("/tme.log"));
+    logger->setLogFile(homeDir + std::string("/aethyra.log"));
 
     #ifdef PACKAGE_VERSION
-        logger->log("Starting The Mana Experiment Version %s", PACKAGE_VERSION);
+        logger->log("Starting Aethyra Version %s", PACKAGE_VERSION);
     #else
-        logger->log("Starting The Mana Experiment - Version not defined");
+        logger->log("Starting Aethyra - Version not defined");
     #endif
 
     // Initialize SDL
@@ -268,7 +268,7 @@ void init_engine(const Options &options)
     strncat(path, "/data", PATH_MAX - 1);
     resman->addToSearchPath(path, true);
 #else
-    resman->addToSearchPath(TME_DATADIR "data", true);
+    resman->addToSearchPath(AETHYRA_DATADIR "data", true);
 #endif
 
     // Fill configuration with defaults
@@ -294,28 +294,28 @@ void init_engine(const Options &options)
 
     // Checking if the configuration file exists... otherwise creates it with
     // default options !
-    FILE *tmeFile = 0;
+    FILE *aethyraFile = 0;
     std::string configPath = options.configPath;
 
     if (configPath.empty())
         configPath = homeDir + "/config.xml";
 
-    tmeFile = fopen(configPath.c_str(), "r");
+    aethyraFile = fopen(configPath.c_str(), "r");
 
     // If we can't read it, it doesn't exist !
-    if (tmeFile == NULL) {
+    if (aethyraFile == NULL) {
         // We reopen the file in write mode and we create it
-        tmeFile = fopen(configPath.c_str(), "wt");
+        aethyraFile = fopen(configPath.c_str(), "wt");
     }
-    if (tmeFile == NULL) {
+    if (aethyraFile == NULL) {
         std::cout << "Can't create " << configPath << ". "
             "Using Defaults." << std::endl;
     } else {
-        fclose(tmeFile);
+        fclose(aethyraFile);
         config.init(configPath);
     }
 
-    SDL_WM_SetCaption("The Mana Experiment", NULL);
+    SDL_WM_SetCaption("Aethyra", NULL);
 #ifdef WIN32
     static SDL_SysWMinfo pInfo;
     SDL_GetWMInfo(&pInfo);
@@ -325,7 +325,7 @@ void init_engine(const Options &options)
         SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
     }
 #else
-    SDL_Surface *icon = IMG_Load(TME_DATADIR "data/icons/tme.png");
+    SDL_Surface *icon = IMG_Load(AETHYRA_DATADIR "data/icons/aethyra.png");
     if (icon)
     {
         SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
@@ -422,7 +422,7 @@ void exit_engine()
 void printHelp()
 {
     std::cout
-        << "tme" << std::endl << std::endl
+        << "aethyra" << std::endl << std::endl
         << "Options: " << std::endl
         << "  -h --help       : Display this help" << std::endl
         << "  -v --version    : Display the version" << std::endl
@@ -439,10 +439,10 @@ void printHelp()
 void printVersion()
 {
 #ifdef PACKAGE_VERSION
-    std::cout << "The Mana Experiment version " << PACKAGE_VERSION <<
+    std::cout << "Aethyra version " << PACKAGE_VERSION <<
         std::endl;
 #else
-    std::cout << "The Mana Experiment version " <<
+    std::cout << "Aethyra version " <<
              "(local build?, PACKAGE_VERSION is not defined)" << std::endl;
 #endif
 }
diff --git a/src/main.h b/src/main.h
index 1f9aa9d0..8dfc51cf 100644
--- a/src/main.h
+++ b/src/main.h
@@ -32,8 +32,8 @@
 #include "winver.h"
 #endif
 
-#ifndef TME_DATADIR
-#define TME_DATADIR ""
+#ifndef AETHYRA_DATADIR
+#define AETHYRA_DATADIR ""
 #endif
 
 /*
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index ae255144..16a2c470 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -219,7 +219,7 @@ ResourceManager::getPath(const std::string &file)
     else
     {
         // if not found in search path return the default path
-        path = std::string(TME_DATADIR) + std::string("data") + "/" + file;
+        path = std::string(AETHYRA_DATADIR) + std::string("data") + "/" + file;
     }
 
     return path;
diff --git a/src/text.h b/src/text.h
index 04b213b3..19d75018 100644
--- a/src/text.h
+++ b/src/text.h
@@ -19,8 +19,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _TME_TEXT_H
-#define _TME_TEXT_H
+#ifndef _AETHYRA_TEXT_H
+#define _AETHYRA_TEXT_H
 
 #include "graphics.h"
 
diff --git a/src/textmanager.h b/src/textmanager.h
index 53419240..5b21ba81 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -19,8 +19,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _TME_TEXTMANAGER_H
-#define _TME_TEXTMANAGER_H
+#ifndef _AETHYRA_TEXTMANAGER_H
+#define _AETHYRA_TEXTMANAGER_H
 
 #include <list>