diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index b6383ac06..33a88a12b 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -60,7 +60,6 @@ using namespace Shared::Util;
 using namespace Shared::Xml;
 
 using namespace std;
-using namespace Glest::Game;
 
 #ifdef _WIN32
 const char *folderDelimiter = "\\";
@@ -74,7 +73,7 @@ const char *folderDelimiter = "/";
 // Because g3d should always support alpha transparency
 string fileFormat = "png";
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		string getGameReadWritePath(const string &lookupKey) {
@@ -1403,7 +1402,7 @@ namespace Shared {
 				}
 			} catch (std::runtime_error &e) {
 				std::cout << e.what() << std::endl;
-				wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a Mega-Glest particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
+				wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a valid particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
 			}
 			if (timer) timer->Start(100);
 		}
diff --git a/source/g3d_viewer/main.h b/source/g3d_viewer/main.h
index a04cf9335..8d2958865 100644
--- a/source/g3d_viewer/main.h
+++ b/source/g3d_viewer/main.h
@@ -38,7 +38,7 @@
 #include "unit_particle_type.h"
 
 using std::string;
-using namespace Glest::Game;
+using namespace ZetaGlest::Game;
 
 namespace Shared {
 	namespace G3dViewer {
diff --git a/source/g3d_viewer/renderer.cpp b/source/g3d_viewer/renderer.cpp
index f0828c72e..770bcdf58 100644
--- a/source/g3d_viewer/renderer.cpp
+++ b/source/g3d_viewer/renderer.cpp
@@ -27,7 +27,7 @@
 
 using namespace Shared::Graphics;
 using namespace Shared::Graphics::Gl;
-using namespace Glest::Game;
+using namespace ZetaGlest::Game;
 using namespace Shared::Util;
 
 namespace Shared {
diff --git a/source/glest_game/ai/ai.cpp b/source/glest_game/ai/ai.cpp
index 41eb4a7fc..34ab0005c 100644
--- a/source/glest_game/ai/ai.cpp
+++ b/source/glest_game/ai/ai.cpp
@@ -31,8 +31,7 @@ Shared::Graphics;
 using namespace
 Shared::Util;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/ai/ai.h b/source/glest_game/ai/ai.h
index 161eec3ed..cb31fe792 100644
--- a/source/glest_game/ai/ai.h
+++ b/source/glest_game/ai/ai.h
@@ -38,8 +38,7 @@ std::list;
 using
 Shared::Util::RandomGen;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/ai/ai_interface.cpp b/source/glest_game/ai/ai_interface.cpp
index 453dacf39..2c28e538e 100644
--- a/source/glest_game/ai/ai_interface.cpp
+++ b/source/glest_game/ai/ai_interface.cpp
@@ -40,10 +40,8 @@ Shared::Graphics;
 //      class AiInterface
 // =====================================================
 
-namespace
-	Glest {
-	namespace
-		Game {
+namespace ZetaGlest {
+	namespace Game {
 
 		// =====================================================
 		//      class FactionThread
diff --git a/source/glest_game/ai/ai_interface.h b/source/glest_game/ai/ai_interface.h
index 031ce9492..7bc795979 100644
--- a/source/glest_game/ai/ai_interface.h
+++ b/source/glest_game/ai/ai_interface.h
@@ -32,8 +32,7 @@
 using
 Shared::Util::intToStr;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/ai/ai_rule.cpp b/source/glest_game/ai/ai_rule.cpp
index fc90df698..1af0a4935 100644
--- a/source/glest_game/ai/ai_rule.cpp
+++ b/source/glest_game/ai/ai_rule.cpp
@@ -30,8 +30,7 @@
 using
 Shared::Graphics::Vec2i;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/ai/ai_rule.h b/source/glest_game/ai/ai_rule.h
index 3b0ec922f..ea763dda0 100644
--- a/source/glest_game/ai/ai_rule.h
+++ b/source/glest_game/ai/ai_rule.h
@@ -36,8 +36,7 @@ std::string;
 using
 Shared::Graphics::Vec2i;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/ai/path_finder.cpp b/source/glest_game/ai/path_finder.cpp
index 410ffde0e..31c8af6e6 100644
--- a/source/glest_game/ai/path_finder.cpp
+++ b/source/glest_game/ai/path_finder.cpp
@@ -41,8 +41,7 @@ Shared::PlatformCommon;
 using
 Shared::Util::RandomGen;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/ai/path_finder.h b/source/glest_game/ai/path_finder.h
index 9c807adad..03e902cc8 100644
--- a/source/glest_game/ai/path_finder.h
+++ b/source/glest_game/ai/path_finder.h
@@ -40,8 +40,7 @@ std::vector;
 using
 Shared::Graphics::Vec2i;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/facilities/auto_test.cpp b/source/glest_game/facilities/auto_test.cpp
index 90c94b98c..ca60bec42 100644
--- a/source/glest_game/facilities/auto_test.cpp
+++ b/source/glest_game/facilities/auto_test.cpp
@@ -31,7 +31,7 @@
 #include "leak_dumper.h"
 
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/facilities/auto_test.h b/source/glest_game/facilities/auto_test.h
index 37b97754f..e85840323 100644
--- a/source/glest_game/facilities/auto_test.h
+++ b/source/glest_game/facilities/auto_test.h
@@ -34,7 +34,7 @@
 using namespace std;
 using Shared::Util::RandomGen;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class Program;
diff --git a/source/glest_game/facilities/components.cpp b/source/glest_game/facilities/components.cpp
index 5dd172d91..9c5051f17 100644
--- a/source/glest_game/facilities/components.cpp
+++ b/source/glest_game/facilities/components.cpp
@@ -34,7 +34,7 @@
 using namespace std;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/facilities/components.h b/source/glest_game/facilities/components.h
index 749abfdfb..76571d836 100644
--- a/source/glest_game/facilities/components.h
+++ b/source/glest_game/facilities/components.h
@@ -43,7 +43,7 @@ using Shared::Graphics::Font3D;
 using namespace Shared::Graphics;
 using Shared::Graphics::Vec3f;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class GraphicComponent;
diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp
index dc97feb7b..789c8cd54 100644
--- a/source/glest_game/facilities/game_util.cpp
+++ b/source/glest_game/facilities/game_util.cpp
@@ -35,7 +35,7 @@ using namespace Shared;
 using namespace Shared::Util;
 using namespace Shared::Platform;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		const char *mailString = "https://github.com/ZetaGlest";
 
diff --git a/source/glest_game/facilities/game_util.h b/source/glest_game/facilities/game_util.h
index 0a360b93a..0b491de3d 100644
--- a/source/glest_game/facilities/game_util.h
+++ b/source/glest_game/facilities/game_util.h
@@ -32,7 +32,7 @@
 
 using std::string;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		extern const char *mailString;
 
diff --git a/source/glest_game/facilities/logger.cpp b/source/glest_game/facilities/logger.cpp
index 041a9a923..55bce1398 100644
--- a/source/glest_game/facilities/logger.cpp
+++ b/source/glest_game/facilities/logger.cpp
@@ -36,7 +36,7 @@ using namespace std;
 using namespace Shared::Graphics;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/facilities/logger.h b/source/glest_game/facilities/logger.h
index c763dda28..a451ddf5c 100644
--- a/source/glest_game/facilities/logger.h
+++ b/source/glest_game/facilities/logger.h
@@ -38,7 +38,7 @@ using std::deque;
 using Shared::Graphics::Texture2D;
 using Shared::Util::Properties;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/game/chat_manager.cpp b/source/glest_game/game/chat_manager.cpp
index cc1a3bf8f..a8a0286c6 100644
--- a/source/glest_game/game/chat_manager.cpp
+++ b/source/glest_game/game/chat_manager.cpp
@@ -37,8 +37,7 @@ Shared::Platform;
 using namespace
 Shared::Util;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/game/chat_manager.h b/source/glest_game/game/chat_manager.h
index 3abfaf023..2e1e95ccd 100644
--- a/source/glest_game/game/chat_manager.h
+++ b/source/glest_game/game/chat_manager.h
@@ -40,8 +40,7 @@ Shared::Graphics::Font2D;
 using
 Shared::Graphics::Font3D;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp
index 9d35b3408..f3ceb1f27 100644
--- a/source/glest_game/game/commander.cpp
+++ b/source/glest_game/game/commander.cpp
@@ -41,8 +41,7 @@ Shared::Util;
 using namespace
 Shared::Platform;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/game/commander.h b/source/glest_game/game/commander.h
index bd6a549e9..976c696e4 100644
--- a/source/glest_game/game/commander.h
+++ b/source/glest_game/game/commander.h
@@ -36,8 +36,7 @@
 using
 std::vector;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/game/console.cpp b/source/glest_game/game/console.cpp
index 9c6b4f4aa..cffaaa433 100644
--- a/source/glest_game/game/console.cpp
+++ b/source/glest_game/game/console.cpp
@@ -32,7 +32,7 @@
 
 using namespace std;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/game/console.h b/source/glest_game/game/console.h
index f671696e6..8772c2f69 100644
--- a/source/glest_game/game/console.h
+++ b/source/glest_game/game/console.h
@@ -42,8 +42,7 @@ std::pair;
 using namespace
 std;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp
index e2e5aab99..6c56c3396 100644
--- a/source/glest_game/game/game.cpp
+++ b/source/glest_game/game/game.cpp
@@ -47,7 +47,7 @@ using namespace Shared::Util;
 using namespace Shared::Platform;
 using namespace Shared::CompressionUtil;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		string GameSettings::playerDisconnectedText = "";
 		Game *thisGamePtr = NULL;
diff --git a/source/glest_game/game/game.h b/source/glest_game/game/game.h
index eef0e014a..8af549f02 100644
--- a/source/glest_game/game/game.h
+++ b/source/glest_game/game/game.h
@@ -53,7 +53,7 @@ namespace Shared {
 	}
 };
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class GraphicMessageBox;
diff --git a/source/glest_game/game/game_camera.cpp b/source/glest_game/game/game_camera.cpp
index fb9f576f6..cb2abff06 100644
--- a/source/glest_game/game/game_camera.cpp
+++ b/source/glest_game/game/game_camera.cpp
@@ -37,8 +37,7 @@ Shared::Xml::XmlNode;
 using namespace
 Shared::Util;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/game/game_camera.h b/source/glest_game/game/game_camera.h
index 84f8ecc87..2c9adff79 100644
--- a/source/glest_game/game/game_camera.h
+++ b/source/glest_game/game/game_camera.h
@@ -37,7 +37,7 @@ namespace Shared {
 	}
 }
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using::Shared::Graphics::Quad2i;
diff --git a/source/glest_game/game/game_constants.h b/source/glest_game/game/game_constants.h
index 65aa78363..e35fbeddf 100644
--- a/source/glest_game/game/game_constants.h
+++ b/source/glest_game/game/game_constants.h
@@ -35,8 +35,7 @@ std;
 using namespace
 Shared::Util;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/game/game_settings.h b/source/glest_game/game/game_settings.h
index 3d00f3279..710933fc6 100644
--- a/source/glest_game/game/game_settings.h
+++ b/source/glest_game/game/game_settings.h
@@ -39,8 +39,7 @@ Shared::Platform;
 using
 Shared::Xml::XmlNode;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/game/script_manager.cpp b/source/glest_game/game/script_manager.cpp
index 45d3b431d..e2e0fb8af 100644
--- a/source/glest_game/game/script_manager.cpp
+++ b/source/glest_game/game/script_manager.cpp
@@ -34,8 +34,7 @@ Shared::Lua;
 using namespace
 Shared::Util;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
@@ -3141,7 +3140,7 @@ namespace
 						result = true;
 						break;
 					case utet_FieldChanged:
-						unit->setCurrField(value == 1 ? Glest::Game::Field::fAir : Glest::Game::Field::fLand);
+						unit->setCurrField(value == 1 ? fAir : fLand);
 						result = true;
 						break;
 					default:
diff --git a/source/glest_game/game/script_manager.h b/source/glest_game/game/script_manager.h
index 681f6ecf5..1e288e050 100644
--- a/source/glest_game/game/script_manager.h
+++ b/source/glest_game/game/script_manager.h
@@ -52,8 +52,7 @@ using
 Shared::Util::RandomGen;
 
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/game/stats.cpp b/source/glest_game/game/stats.cpp
index d4f6f56d5..74b97761e 100644
--- a/source/glest_game/game/stats.cpp
+++ b/source/glest_game/game/stats.cpp
@@ -21,7 +21,7 @@
 #include "lang.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		PlayerStats::PlayerStats() {
diff --git a/source/glest_game/game/stats.h b/source/glest_game/game/stats.h
index ce3c84f09..2bcb487fc 100644
--- a/source/glest_game/game/stats.h
+++ b/source/glest_game/game/stats.h
@@ -37,8 +37,7 @@ std::string;
 using namespace
 Shared::Graphics;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/global/config.cpp b/source/glest_game/global/config.cpp
index 291d45cad..6acd5b7ef 100644
--- a/source/glest_game/global/config.cpp
+++ b/source/glest_game/global/config.cpp
@@ -34,7 +34,7 @@ using namespace Shared::Platform;
 using namespace Shared::Util;
 using namespace std;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		int GameConstants::networkFramePeriod = 20;
@@ -256,7 +256,6 @@ namespace Glest {
 			}
 
 #if defined(WIN32)
-			//string test = "C:\\Code\\zetaglest\\mk\\windows\\.\\..\\..\\data\\glest_game\\glest.ini";
 			//updatePathClimbingParts(test);
 
 			updatePathClimbingParts(fileName.first);
diff --git a/source/glest_game/global/config.h b/source/glest_game/global/config.h
index dc5a37ad9..fac361375 100644
--- a/source/glest_game/global/config.h
+++ b/source/glest_game/global/config.h
@@ -31,7 +31,7 @@
 #   include <SDL.h>
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Util::Properties;
diff --git a/source/glest_game/global/core_data.cpp b/source/glest_game/global/core_data.cpp
index 44d57b66f..e63f9779b 100644
--- a/source/glest_game/global/core_data.cpp
+++ b/source/glest_game/global/core_data.cpp
@@ -37,7 +37,7 @@ using namespace Shared::Sound;
 using namespace Shared::Graphics;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/global/core_data.h b/source/glest_game/global/core_data.h
index f7652056d..3948c93d0 100644
--- a/source/glest_game/global/core_data.h
+++ b/source/glest_game/global/core_data.h
@@ -32,7 +32,7 @@
 #   include "sound_container.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using::Shared::Graphics::Texture2D;
diff --git a/source/glest_game/global/lang.cpp b/source/glest_game/global/lang.cpp
index 5e7df127a..bb3f5f7a4 100644
--- a/source/glest_game/global/lang.cpp
+++ b/source/glest_game/global/lang.cpp
@@ -40,7 +40,7 @@ using namespace std;
 using namespace Shared::Util;
 using namespace Shared::Platform;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		const char *DEFAULT_LANGUAGE = "english";
diff --git a/source/glest_game/global/lang.h b/source/glest_game/global/lang.h
index c204d3d30..c0006eb61 100644
--- a/source/glest_game/global/lang.h
+++ b/source/glest_game/global/lang.h
@@ -28,7 +28,7 @@
 #   include "properties.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Util::Properties;
diff --git a/source/glest_game/global/metrics.cpp b/source/glest_game/global/metrics.cpp
index 94861d3dc..f2fcfe1d5 100644
--- a/source/glest_game/global/metrics.cpp
+++ b/source/glest_game/global/metrics.cpp
@@ -24,7 +24,7 @@
 
 using namespace std;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 
diff --git a/source/glest_game/global/metrics.h b/source/glest_game/global/metrics.h
index 71c7f750a..ac3f9041b 100644
--- a/source/glest_game/global/metrics.h
+++ b/source/glest_game/global/metrics.h
@@ -28,7 +28,7 @@
 #   include "config.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/graphics/particle_type.cpp b/source/glest_game/graphics/particle_type.cpp
index 6e035710a..105243b97 100644
--- a/source/glest_game/graphics/particle_type.cpp
+++ b/source/glest_game/graphics/particle_type.cpp
@@ -36,7 +36,7 @@ using namespace Shared::Graphics;
 using namespace Shared::Util;
 using namespace Shared::PlatformCommon;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/graphics/particle_type.h b/source/glest_game/graphics/particle_type.h
index 6d0a96786..d4204ea8a 100644
--- a/source/glest_game/graphics/particle_type.h
+++ b/source/glest_game/graphics/particle_type.h
@@ -38,7 +38,7 @@
 using std::string;
 using namespace Shared::Graphics;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::ParticleSystem;
diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index f073c8d87..403b87e90 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -45,7 +45,7 @@ using namespace Shared::Graphics::Gl;
 using namespace Shared::Util;
 using namespace Shared::Graphics;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		uint32 Renderer::SurfaceData::nextUniqueId = 1;
diff --git a/source/glest_game/graphics/renderer.h b/source/glest_game/graphics/renderer.h
index bae8b139d..b26604662 100644
--- a/source/glest_game/graphics/renderer.h
+++ b/source/glest_game/graphics/renderer.h
@@ -62,7 +62,7 @@ enum DebugUILevelType {
 	debugui_unit_titles = 0x02
 };
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using namespace ::Shared::Graphics;
diff --git a/source/glest_game/graphics/unit_particle_type.cpp b/source/glest_game/graphics/unit_particle_type.cpp
index 7fe152a0d..185be728e 100644
--- a/source/glest_game/graphics/unit_particle_type.cpp
+++ b/source/glest_game/graphics/unit_particle_type.cpp
@@ -33,7 +33,7 @@ using namespace Shared::Graphics;
 using namespace Shared::Util;
 using namespace Shared::PlatformCommon;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/graphics/unit_particle_type.h b/source/glest_game/graphics/unit_particle_type.h
index 6c2e2999a..aa9c38366 100644
--- a/source/glest_game/graphics/unit_particle_type.h
+++ b/source/glest_game/graphics/unit_particle_type.h
@@ -40,7 +40,7 @@
 using std::string;
 using namespace Shared::Graphics;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::ParticleManager;
diff --git a/source/glest_game/gui/display.cpp b/source/glest_game/gui/display.cpp
index a3030e91f..520dbbf22 100644
--- a/source/glest_game/gui/display.cpp
+++ b/source/glest_game/gui/display.cpp
@@ -27,7 +27,7 @@
 using namespace Shared::Graphics;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/gui/display.h b/source/glest_game/gui/display.h
index 6bd6fea77..b9858d8e0 100644
--- a/source/glest_game/gui/display.h
+++ b/source/glest_game/gui/display.h
@@ -38,7 +38,7 @@ using Shared::Graphics::Texture2D;
 using Shared::Graphics::Vec4f;
 using Shared::Util::replaceBy;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/gui/gui.cpp b/source/glest_game/gui/gui.cpp
index 4aa4859bc..216f74f6d 100644
--- a/source/glest_game/gui/gui.cpp
+++ b/source/glest_game/gui/gui.cpp
@@ -42,7 +42,7 @@
 using namespace Shared::Graphics;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/gui/gui.h b/source/glest_game/gui/gui.h
index ea6ef0b46..a03f4d042 100644
--- a/source/glest_game/gui/gui.h
+++ b/source/glest_game/gui/gui.h
@@ -34,7 +34,7 @@
 
 using Shared::Util::RandomGen;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class Unit;
diff --git a/source/glest_game/gui/selection.cpp b/source/glest_game/gui/selection.cpp
index ae68419f0..2f82b9d07 100644
--- a/source/glest_game/gui/selection.cpp
+++ b/source/glest_game/gui/selection.cpp
@@ -29,7 +29,7 @@
 
 using namespace std;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
@@ -62,7 +62,6 @@ namespace Glest {
 
 		bool Selection::select(Unit *unit, bool addToSelection) {
 			bool result = false;
-			// Fix Bug reported on sourceforge.net: Glest::Game::Selection::select crash with NULL pointer - ID: 3608835
 			if (unit != NULL) {
 				//check if already selected
 				for (int index = 0; index < (int) selectedUnits.size(); ++index) {
diff --git a/source/glest_game/gui/selection.h b/source/glest_game/gui/selection.h
index cfe4c2ff0..ad4f79b35 100644
--- a/source/glest_game/gui/selection.h
+++ b/source/glest_game/gui/selection.h
@@ -31,7 +31,7 @@
 
 using std::vector;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class Gui;
diff --git a/source/glest_game/main/battle_end.cpp b/source/glest_game/main/battle_end.cpp
index c66ffcf23..8a7dfbf9f 100644
--- a/source/glest_game/main/battle_end.cpp
+++ b/source/glest_game/main/battle_end.cpp
@@ -39,7 +39,7 @@
 using namespace
 Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/main/battle_end.h b/source/glest_game/main/battle_end.h
index ca417c832..ebb83652e 100644
--- a/source/glest_game/main/battle_end.h
+++ b/source/glest_game/main/battle_end.h
@@ -35,7 +35,7 @@ namespace Shared {
 	}
 }
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class GameSettings;
diff --git a/source/glest_game/main/intro.cpp b/source/glest_game/main/intro.cpp
index 3b5744722..6e99458ea 100644
--- a/source/glest_game/main/intro.cpp
+++ b/source/glest_game/main/intro.cpp
@@ -47,7 +47,7 @@ using
 namespace
 	Shared::Xml;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		//struct Timer {
diff --git a/source/glest_game/main/intro.h b/source/glest_game/main/intro.h
index 30eb1f2f7..09f99624a 100644
--- a/source/glest_game/main/intro.h
+++ b/source/glest_game/main/intro.h
@@ -50,7 +50,7 @@ using Shared::Util::RandomGen;
 //class Md5Object;
 //}}}
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index 4a405100f..a26c3e50c 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -118,21 +118,12 @@ using namespace Shared::Xml;
 using namespace Shared;
 
 void handleUnexpectedError(const char* message) {
-	Glest::Game::GameNetworkInterface* gameNetworkInterface = Glest::Game::NetworkManager::getInstance().getGameNetworkInterface();
+	ZetaGlest::Game::GameNetworkInterface* gameNetworkInterface = ZetaGlest::Game::NetworkManager::getInstance().getGameNetworkInterface();
 	if (gameNetworkInterface != NULL)
 		gameNetworkInterface->sendTextMessage(message, -1, true, "");
 }
 
-/**
-* @namespace Glest
-* Namespace used for all %Glest related code.
-*/
-/**
-* @namespace Game
-* Namespace used for game related code.
-*/
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
@@ -8440,4 +8431,4 @@ namespace
 	}
 }                               //end namespace
 
-MAIN_FUNCTION(Glest::Game::glestMainWrapper)
+MAIN_FUNCTION(ZetaGlest::Game::glestMainWrapper)
diff --git a/source/glest_game/main/main.h b/source/glest_game/main/main.h
index 891174b5d..55fff1de9 100644
--- a/source/glest_game/main/main.h
+++ b/source/glest_game/main/main.h
@@ -28,7 +28,7 @@
 using Shared::Platform::MouseButton;
 using Shared::Platform::MouseState;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/main/program.cpp b/source/glest_game/main/program.cpp
index 3196bf598..112dda35b 100644
--- a/source/glest_game/main/program.cpp
+++ b/source/glest_game/main/program.cpp
@@ -51,7 +51,7 @@ namespace
 //      class Program
 // =====================================================
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		const int
diff --git a/source/glest_game/main/program.h b/source/glest_game/main/program.h
index 689b2eaad..6a70bd6a9 100644
--- a/source/glest_game/main/program.h
+++ b/source/glest_game/main/program.h
@@ -50,7 +50,7 @@ using
 namespace
 	Shared::PlatformCommon;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class Program;
diff --git a/source/glest_game/menu/main_menu.cpp b/source/glest_game/menu/main_menu.cpp
index 32e1d1b14..ff4aca5ae 100644
--- a/source/glest_game/menu/main_menu.cpp
+++ b/source/glest_game/menu/main_menu.cpp
@@ -50,8 +50,7 @@ Shared::Graphics;
 using namespace
 Shared::Xml;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/menu/main_menu.h b/source/glest_game/menu/main_menu.h
index 697a5509e..a99b222ca 100644
--- a/source/glest_game/menu/main_menu.h
+++ b/source/glest_game/menu/main_menu.h
@@ -41,7 +41,7 @@ namespace Shared {
 	}
 }
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class MenuState;
diff --git a/source/glest_game/menu/menu_background.cpp b/source/glest_game/menu/menu_background.cpp
index 8e212fdf1..dad360639 100644
--- a/source/glest_game/menu/menu_background.cpp
+++ b/source/glest_game/menu/menu_background.cpp
@@ -37,8 +37,7 @@ Shared::Xml;
 using namespace
 Shared::Graphics;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/menu/menu_background.h b/source/glest_game/menu/menu_background.h
index 7d7a9b15e..5a0f96b1d 100644
--- a/source/glest_game/menu/menu_background.h
+++ b/source/glest_game/menu/menu_background.h
@@ -50,8 +50,7 @@ Shared::Graphics::Model;
 using
 Shared::Util::RandomGen;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/menu/menu_state_about.cpp b/source/glest_game/menu/menu_state_about.cpp
index a498ba6f6..be680eb4c 100644
--- a/source/glest_game/menu/menu_state_about.cpp
+++ b/source/glest_game/menu/menu_state_about.cpp
@@ -33,7 +33,7 @@
 
 using namespace std;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/menu/menu_state_about.h b/source/glest_game/menu/menu_state_about.h
index a27eecb56..326afa282 100644
--- a/source/glest_game/menu/menu_state_about.h
+++ b/source/glest_game/menu/menu_state_about.h
@@ -28,7 +28,7 @@
 #   include "main_menu.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index 43190661a..f2f8a2a88 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -48,7 +48,7 @@ using namespace Shared;
 using namespace Shared::Util;
 using namespace Shared::CompressionUtil;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		static const int
diff --git a/source/glest_game/menu/menu_state_connected_game.h b/source/glest_game/menu/menu_state_connected_game.h
index 5f9593fe4..452636f71 100644
--- a/source/glest_game/menu/menu_state_connected_game.h
+++ b/source/glest_game/menu/menu_state_connected_game.h
@@ -38,7 +38,7 @@ namespace Shared {
 	}
 }
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class TechTree;
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index bad1be571..9987013ac 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -47,7 +47,7 @@
 using namespace Shared;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		const int MASTERSERVER_BROADCAST_MAX_WAIT_RESPONSE_SECONDS = 15;
 		static const char *SAVED_GAME_FILENAME = "lastCustomGameSettings.mgg";
diff --git a/source/glest_game/menu/menu_state_custom_game.h b/source/glest_game/menu/menu_state_custom_game.h
index b0215901d..a8a88534f 100644
--- a/source/glest_game/menu/menu_state_custom_game.h
+++ b/source/glest_game/menu/menu_state_custom_game.h
@@ -36,7 +36,7 @@ namespace Shared {
 	}
 }
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class SwitchSetupRequest;
diff --git a/source/glest_game/menu/menu_state_custom_game_update.cpp b/source/glest_game/menu/menu_state_custom_game_update.cpp
index a12c60740..e7e96e5c4 100644
--- a/source/glest_game/menu/menu_state_custom_game_update.cpp
+++ b/source/glest_game/menu/menu_state_custom_game_update.cpp
@@ -23,7 +23,7 @@
 #include "server_interface.h"
 #include "network_manager.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		const int MASTERSERVER_BROADCAST_PUBLISH_SECONDS = 6;
 		const int BROADCAST_SETTINGS_SECONDS = 4;
diff --git a/source/glest_game/menu/menu_state_graphic_info.cpp b/source/glest_game/menu/menu_state_graphic_info.cpp
index 57edc3529..76627ae44 100644
--- a/source/glest_game/menu/menu_state_graphic_info.cpp
+++ b/source/glest_game/menu/menu_state_graphic_info.cpp
@@ -27,7 +27,7 @@
 #include "opengl.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/menu/menu_state_graphic_info.h b/source/glest_game/menu/menu_state_graphic_info.h
index b104c4467..2ce1f4fd2 100644
--- a/source/glest_game/menu/menu_state_graphic_info.h
+++ b/source/glest_game/menu/menu_state_graphic_info.h
@@ -26,8 +26,7 @@
 using namespace
 Shared::Graphics::Gl;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/menu/menu_state_join_game.cpp b/source/glest_game/menu/menu_state_join_game.cpp
index 2e9876a09..0dfbcf878 100644
--- a/source/glest_game/menu/menu_state_join_game.cpp
+++ b/source/glest_game/menu/menu_state_join_game.cpp
@@ -37,7 +37,7 @@
 
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using namespace::Shared::Util;
diff --git a/source/glest_game/menu/menu_state_join_game.h b/source/glest_game/menu/menu_state_join_game.h
index 4a668d585..f32b8959e 100644
--- a/source/glest_game/menu/menu_state_join_game.h
+++ b/source/glest_game/menu/menu_state_join_game.h
@@ -34,7 +34,7 @@
 
 using Shared::Util::Properties;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class NetworkMessageIntro;
diff --git a/source/glest_game/menu/menu_state_keysetup.cpp b/source/glest_game/menu/menu_state_keysetup.cpp
index 2226df529..ca749f7ce 100644
--- a/source/glest_game/menu/menu_state_keysetup.cpp
+++ b/source/glest_game/menu/menu_state_keysetup.cpp
@@ -35,7 +35,7 @@
 
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 
diff --git a/source/glest_game/menu/menu_state_keysetup.h b/source/glest_game/menu/menu_state_keysetup.h
index 12458e83b..67fe533ec 100644
--- a/source/glest_game/menu/menu_state_keysetup.h
+++ b/source/glest_game/menu/menu_state_keysetup.h
@@ -24,7 +24,7 @@
 #   include "server_line.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_load_game.cpp b/source/glest_game/menu/menu_state_load_game.cpp
index b1f8cbf3b..67d02be4e 100644
--- a/source/glest_game/menu/menu_state_load_game.cpp
+++ b/source/glest_game/menu/menu_state_load_game.cpp
@@ -34,7 +34,7 @@
 
 using namespace Shared;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/menu/menu_state_load_game.h b/source/glest_game/menu/menu_state_load_game.h
index 6a84d6388..012823168 100644
--- a/source/glest_game/menu/menu_state_load_game.h
+++ b/source/glest_game/menu/menu_state_load_game.h
@@ -23,7 +23,7 @@
 #   include "main_menu.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp
index 40c4df537..3436e40e6 100644
--- a/source/glest_game/menu/menu_state_masterserver.cpp
+++ b/source/glest_game/menu/menu_state_masterserver.cpp
@@ -40,7 +40,7 @@
 
 using namespace Shared;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		DisplayMessageFunction MenuStateMasterserver::pCB_DisplayMessage = NULL;
diff --git a/source/glest_game/menu/menu_state_masterserver.h b/source/glest_game/menu/menu_state_masterserver.h
index 92a9232cf..88f5aec32 100644
--- a/source/glest_game/menu/menu_state_masterserver.h
+++ b/source/glest_game/menu/menu_state_masterserver.h
@@ -29,7 +29,7 @@
 #   include "chat_manager.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp
index 51571fe9e..a4a7c2cb8 100644
--- a/source/glest_game/menu/menu_state_mods.cpp
+++ b/source/glest_game/menu/menu_state_mods.cpp
@@ -37,7 +37,7 @@
 using namespace Shared;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		struct FormatString {
 			void operator () (string & s) {
diff --git a/source/glest_game/menu/menu_state_mods.h b/source/glest_game/menu/menu_state_mods.h
index ab33ba933..d93d2ce7a 100644
--- a/source/glest_game/menu/menu_state_mods.h
+++ b/source/glest_game/menu/menu_state_mods.h
@@ -27,7 +27,7 @@
 #   include <vector>
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		enum FTPMessageType {
diff --git a/source/glest_game/menu/menu_state_new_game.cpp b/source/glest_game/menu/menu_state_new_game.cpp
index 61bb42c61..9b76315ad 100644
--- a/source/glest_game/menu/menu_state_new_game.cpp
+++ b/source/glest_game/menu/menu_state_new_game.cpp
@@ -36,7 +36,7 @@
 
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/menu/menu_state_new_game.h b/source/glest_game/menu/menu_state_new_game.h
index b886a5e5a..fd10e9d60 100644
--- a/source/glest_game/menu/menu_state_new_game.h
+++ b/source/glest_game/menu/menu_state_new_game.h
@@ -23,7 +23,7 @@
 #   include "main_menu.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp
index c602a7a8b..c64f5b0f7 100644
--- a/source/glest_game/menu/menu_state_options.cpp
+++ b/source/glest_game/menu/menu_state_options.cpp
@@ -39,8 +39,7 @@
 using namespace
 Shared::Util;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/menu/menu_state_options.h b/source/glest_game/menu/menu_state_options.h
index d425f1a5d..5b7571985 100644
--- a/source/glest_game/menu/menu_state_options.h
+++ b/source/glest_game/menu/menu_state_options.h
@@ -23,7 +23,7 @@
 #   include "main_menu.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_options_graphics.cpp b/source/glest_game/menu/menu_state_options_graphics.cpp
index 3357ef614..8046547d9 100644
--- a/source/glest_game/menu/menu_state_options_graphics.cpp
+++ b/source/glest_game/menu/menu_state_options_graphics.cpp
@@ -40,8 +40,7 @@
 using namespace
 Shared::Util;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/menu/menu_state_options_graphics.h b/source/glest_game/menu/menu_state_options_graphics.h
index 9b31f4561..91a4933a3 100644
--- a/source/glest_game/menu/menu_state_options_graphics.h
+++ b/source/glest_game/menu/menu_state_options_graphics.h
@@ -23,7 +23,7 @@
 #   include "main_menu.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_options_network.cpp b/source/glest_game/menu/menu_state_options_network.cpp
index 38818bf53..266713f71 100644
--- a/source/glest_game/menu/menu_state_options_network.cpp
+++ b/source/glest_game/menu/menu_state_options_network.cpp
@@ -39,8 +39,7 @@
 using namespace
 Shared::Util;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/menu/menu_state_options_network.h b/source/glest_game/menu/menu_state_options_network.h
index dd6e4a1a8..b89505628 100644
--- a/source/glest_game/menu/menu_state_options_network.h
+++ b/source/glest_game/menu/menu_state_options_network.h
@@ -23,7 +23,7 @@
 #   include "main_menu.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_options_sound.cpp b/source/glest_game/menu/menu_state_options_sound.cpp
index 823e295cf..61c15aa54 100644
--- a/source/glest_game/menu/menu_state_options_sound.cpp
+++ b/source/glest_game/menu/menu_state_options_sound.cpp
@@ -39,8 +39,7 @@
 using namespace
 Shared::Util;
 
-namespace
-	Glest {
+namespace ZetaGlest {
 	namespace
 		Game {
 
diff --git a/source/glest_game/menu/menu_state_options_sound.h b/source/glest_game/menu/menu_state_options_sound.h
index 7147b865a..90f999a7d 100644
--- a/source/glest_game/menu/menu_state_options_sound.h
+++ b/source/glest_game/menu/menu_state_options_sound.h
@@ -23,7 +23,7 @@
 #   include "main_menu.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_root.cpp b/source/glest_game/menu/menu_state_root.cpp
index caca826c7..f9a5b1368 100644
--- a/source/glest_game/menu/menu_state_root.cpp
+++ b/source/glest_game/menu/menu_state_root.cpp
@@ -42,7 +42,7 @@
 
 using namespace Shared;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/menu/menu_state_root.h b/source/glest_game/menu/menu_state_root.h
index c70297e9f..25c79d205 100644
--- a/source/glest_game/menu/menu_state_root.h
+++ b/source/glest_game/menu/menu_state_root.h
@@ -26,7 +26,7 @@
 
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/menu_state_scenario.cpp b/source/glest_game/menu/menu_state_scenario.cpp
index 4761ba43a..b67248246 100644
--- a/source/glest_game/menu/menu_state_scenario.cpp
+++ b/source/glest_game/menu/menu_state_scenario.cpp
@@ -31,7 +31,7 @@
 
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using namespace::Shared::Xml;
diff --git a/source/glest_game/menu/menu_state_scenario.h b/source/glest_game/menu/menu_state_scenario.h
index 47700aefa..a3b1edd87 100644
--- a/source/glest_game/menu/menu_state_scenario.h
+++ b/source/glest_game/menu/menu_state_scenario.h
@@ -23,7 +23,7 @@
 #   include "main_menu.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/menu/server_line.cpp b/source/glest_game/menu/server_line.cpp
index 2f47ce146..fd19cdfcc 100644
--- a/source/glest_game/menu/server_line.cpp
+++ b/source/glest_game/menu/server_line.cpp
@@ -32,7 +32,7 @@
 
 using namespace Shared;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/menu/server_line.h b/source/glest_game/menu/server_line.h
index 69cf7596e..e6120daef 100644
--- a/source/glest_game/menu/server_line.h
+++ b/source/glest_game/menu/server_line.h
@@ -32,7 +32,7 @@
 
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/network/client_interface.cpp b/source/glest_game/network/client_interface.cpp
index 650f6d7c0..fbcace4e3 100644
--- a/source/glest_game/network/client_interface.cpp
+++ b/source/glest_game/network/client_interface.cpp
@@ -44,7 +44,7 @@ using namespace Shared::Util;
 
 #endif
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		const bool debugClientInterfacePerf = false;
diff --git a/source/glest_game/network/client_interface.h b/source/glest_game/network/client_interface.h
index feed76dad..84c12f39e 100644
--- a/source/glest_game/network/client_interface.h
+++ b/source/glest_game/network/client_interface.h
@@ -34,7 +34,7 @@ using Shared::Platform::Ip;
 using Shared::Platform::ClientSocket;
 using std::vector;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class ClientInterface;
diff --git a/source/glest_game/network/connection_slot.cpp b/source/glest_game/network/connection_slot.cpp
index 60ee651ec..5959307ae 100644
--- a/source/glest_game/network/connection_slot.cpp
+++ b/source/glest_game/network/connection_slot.cpp
@@ -34,7 +34,7 @@ using namespace std;
 using namespace Shared;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/network/connection_slot.h b/source/glest_game/network/connection_slot.h
index 85c30e6e9..0f23f2fd6 100644
--- a/source/glest_game/network/connection_slot.h
+++ b/source/glest_game/network/connection_slot.h
@@ -32,7 +32,7 @@ using Shared::Platform::ServerSocket;
 using Shared::Platform::Socket;
 using std::vector;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class ServerInterface;
diff --git a/source/glest_game/network/masterserver_info.h b/source/glest_game/network/masterserver_info.h
index 52cf6b031..32b4c5d5c 100644
--- a/source/glest_game/network/masterserver_info.h
+++ b/source/glest_game/network/masterserver_info.h
@@ -26,7 +26,7 @@
 
 using std::string;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===========================================================
diff --git a/source/glest_game/network/network_interface.cpp b/source/glest_game/network/network_interface.cpp
index eb52dc990..dd22491ca 100644
--- a/source/glest_game/network/network_interface.cpp
+++ b/source/glest_game/network/network_interface.cpp
@@ -34,7 +34,7 @@ using namespace Shared::Platform;
 using namespace Shared::Util;
 using namespace std;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/network/network_interface.h b/source/glest_game/network/network_interface.h
index 7cf2be460..28c2a7511 100644
--- a/source/glest_game/network/network_interface.h
+++ b/source/glest_game/network/network_interface.h
@@ -42,7 +42,7 @@ using Shared::Util::Checksum;
 using namespace Shared::Util;
 using namespace Shared::Platform;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/network/network_manager.cpp b/source/glest_game/network/network_manager.cpp
index 2025ff4eb..c93410b19 100644
--- a/source/glest_game/network/network_manager.cpp
+++ b/source/glest_game/network/network_manager.cpp
@@ -23,7 +23,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/network/network_manager.h b/source/glest_game/network/network_manager.h
index 75bb7fa18..0142a0ff0 100644
--- a/source/glest_game/network/network_manager.h
+++ b/source/glest_game/network/network_manager.h
@@ -29,7 +29,7 @@
 
 using Shared::Util::Checksum;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/network/network_message.cpp b/source/glest_game/network/network_message.cpp
index 89ada8a6b..7ec195830 100644
--- a/source/glest_game/network/network_message.cpp
+++ b/source/glest_game/network/network_message.cpp
@@ -39,7 +39,7 @@ using namespace Shared::Util;
 using namespace std;
 using std::min;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		bool NetworkMessage::useOldProtocol = true;
diff --git a/source/glest_game/network/network_message.h b/source/glest_game/network/network_message.h
index 705120cde..a7cb16bd6 100644
--- a/source/glest_game/network/network_message.h
+++ b/source/glest_game/network/network_message.h
@@ -33,7 +33,7 @@ using Shared::Platform::int8;
 using Shared::Platform::uint8;
 using Shared::Platform::int16;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class GameSettings;
diff --git a/source/glest_game/network/network_protocol.cpp b/source/glest_game/network/network_protocol.cpp
index 61e75bac1..1f561aeef 100644
--- a/source/glest_game/network/network_protocol.cpp
+++ b/source/glest_game/network/network_protocol.cpp
@@ -29,7 +29,7 @@
 using namespace Shared::Platform;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 #pragma pack(push, 1)
diff --git a/source/glest_game/network/network_protocol.h b/source/glest_game/network/network_protocol.h
index 15ecd2a8b..141c52a19 100644
--- a/source/glest_game/network/network_protocol.h
+++ b/source/glest_game/network/network_protocol.h
@@ -20,7 +20,7 @@
 #ifndef NETWORK_PROTOCOL_H_
 #define NETWORK_PROTOCOL_H_
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		unsigned int pack(unsigned char *buf, const char *format, ...);
diff --git a/source/glest_game/network/network_types.cpp b/source/glest_game/network/network_types.cpp
index aeb6c1598..736bf28c4 100644
--- a/source/glest_game/network/network_types.cpp
+++ b/source/glest_game/network/network_types.cpp
@@ -28,7 +28,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/network/network_types.h b/source/glest_game/network/network_types.h
index d25f207ba..2f29d23a2 100644
--- a/source/glest_game/network/network_types.h
+++ b/source/glest_game/network/network_types.h
@@ -40,7 +40,7 @@ using Shared::Platform::uint16;
 using Shared::Platform::int32;
 using Shared::Graphics::Vec2i;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class World;
diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp
index 0576613fe..bace59d2b 100644
--- a/source/glest_game/network/server_interface.cpp
+++ b/source/glest_game/network/server_interface.cpp
@@ -47,7 +47,7 @@ using namespace Shared::Platform;
 using namespace Shared::Util;
 using namespace Shared::Map;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		double maxFrameCountLagAllowed = 30;
 		double maxClientLagTimeAllowed = 25;
diff --git a/source/glest_game/network/server_interface.h b/source/glest_game/network/server_interface.h
index 2f5b96dba..74e862be3 100644
--- a/source/glest_game/network/server_interface.h
+++ b/source/glest_game/network/server_interface.h
@@ -41,7 +41,7 @@ namespace Shared {
 	}
 }
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		extern double maxFrameCountLagAllowed;
 		extern double maxClientLagTimeAllowed;
diff --git a/source/glest_game/sound/sound_container.cpp b/source/glest_game/sound/sound_container.cpp
index 566c91050..5d0d0eae6 100644
--- a/source/glest_game/sound/sound_container.cpp
+++ b/source/glest_game/sound/sound_container.cpp
@@ -24,7 +24,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/sound/sound_container.h b/source/glest_game/sound/sound_container.h
index 4d683aaad..30788e8bd 100644
--- a/source/glest_game/sound/sound_container.h
+++ b/source/glest_game/sound/sound_container.h
@@ -34,7 +34,7 @@ using std::vector;
 using Shared::Util::RandomGen;
 using Shared::Sound::StaticSound;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/sound/sound_renderer.cpp b/source/glest_game/sound/sound_renderer.cpp
index c31793c95..a95ef94c0 100644
--- a/source/glest_game/sound/sound_renderer.cpp
+++ b/source/glest_game/sound/sound_renderer.cpp
@@ -30,7 +30,7 @@ using namespace Shared::Util;
 using namespace Shared::Graphics;
 using namespace Shared::Sound;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		const int SoundRenderer::ambientFade = 6000;
diff --git a/source/glest_game/sound/sound_renderer.h b/source/glest_game/sound/sound_renderer.h
index 1f39a361e..7aed1addb 100644
--- a/source/glest_game/sound/sound_renderer.h
+++ b/source/glest_game/sound/sound_renderer.h
@@ -33,7 +33,7 @@
 #include "platform_common.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using ::Shared::Sound::StrSound;
diff --git a/source/glest_game/steam/steam.cpp b/source/glest_game/steam/steam.cpp
index 57ee5365d..c72f408f7 100644
--- a/source/glest_game/steam/steam.cpp
+++ b/source/glest_game/steam/steam.cpp
@@ -24,7 +24,7 @@
 #include "steamshim_child.h"
 #include "platform_common.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		std::map<std::string, SteamStatType> Steam::SteamStatNameTypes = Steam::create_map();
diff --git a/source/glest_game/steam/steam.h b/source/glest_game/steam/steam.h
index 2bc1475f9..f2774b662 100644
--- a/source/glest_game/steam/steam.h
+++ b/source/glest_game/steam/steam.h
@@ -24,7 +24,7 @@
 #include <map>
 #include "game_constants.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		struct SteamPrivate;
diff --git a/source/glest_game/type_instances/command.cpp b/source/glest_game/type_instances/command.cpp
index 1fb90e6fd..1623d4b76 100644
--- a/source/glest_game/type_instances/command.cpp
+++ b/source/glest_game/type_instances/command.cpp
@@ -29,7 +29,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/type_instances/command.h b/source/glest_game/type_instances/command.h
index 9f5fddc74..5b5913f30 100644
--- a/source/glest_game/type_instances/command.h
+++ b/source/glest_game/type_instances/command.h
@@ -31,7 +31,7 @@
 #   include "game_constants.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::Vec2i;
diff --git a/source/glest_game/type_instances/faction.cpp b/source/glest_game/type_instances/faction.cpp
index 44eeb0f57..3dabb305b 100644
--- a/source/glest_game/type_instances/faction.cpp
+++ b/source/glest_game/type_instances/faction.cpp
@@ -36,7 +36,7 @@
 using namespace Shared::Util;
 using Shared::Util::RandomGen;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		bool CommandGroupUnitSorterId::operator () (const int l, const int r) {
diff --git a/source/glest_game/type_instances/faction.h b/source/glest_game/type_instances/faction.h
index a333e4fa9..bfa479503 100644
--- a/source/glest_game/type_instances/faction.h
+++ b/source/glest_game/type_instances/faction.h
@@ -44,7 +44,7 @@ using std::set;
 using Shared::Graphics::Texture2D;
 using namespace Shared::PlatformCommon;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class Unit;
diff --git a/source/glest_game/type_instances/object.cpp b/source/glest_game/type_instances/object.cpp
index 24855516c..cf42d4425 100644
--- a/source/glest_game/type_instances/object.cpp
+++ b/source/glest_game/type_instances/object.cpp
@@ -34,7 +34,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		ObjectStateInterface *Object::stateCallback = NULL;
diff --git a/source/glest_game/type_instances/object.h b/source/glest_game/type_instances/object.h
index facb7d550..4dd5631c5 100644
--- a/source/glest_game/type_instances/object.h
+++ b/source/glest_game/type_instances/object.h
@@ -32,7 +32,7 @@
 #   include "object_type.h"
 #   include "tileset_model_type.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class ObjectType;
diff --git a/source/glest_game/type_instances/resource.cpp b/source/glest_game/type_instances/resource.cpp
index b9c7185fa..12554e982 100644
--- a/source/glest_game/type_instances/resource.cpp
+++ b/source/glest_game/type_instances/resource.cpp
@@ -30,7 +30,7 @@
 using namespace Shared::Graphics;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/type_instances/resource.h b/source/glest_game/type_instances/resource.h
index 897edc501..3c36ffe96 100644
--- a/source/glest_game/type_instances/resource.h
+++ b/source/glest_game/type_instances/resource.h
@@ -35,7 +35,7 @@ using std::string;
 using std::map;
 using Shared::Xml::XmlNode;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::Vec2i;
diff --git a/source/glest_game/type_instances/unit.cpp b/source/glest_game/type_instances/unit.cpp
index 5245c1f52..bae9f7ece 100644
--- a/source/glest_game/type_instances/unit.cpp
+++ b/source/glest_game/type_instances/unit.cpp
@@ -41,7 +41,7 @@ using namespace Shared::Graphics;
 using namespace Shared::Util;
 
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		const int CHANGE_COMMAND_SPEED = 325;
diff --git a/source/glest_game/type_instances/unit.h b/source/glest_game/type_instances/unit.h
index 1d7ab45ed..6e355113d 100644
--- a/source/glest_game/type_instances/unit.h
+++ b/source/glest_game/type_instances/unit.h
@@ -37,7 +37,7 @@
 
 //#define LEAK_CHECK_UNITS
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::ParticleSystem;
diff --git a/source/glest_game/type_instances/upgrade.cpp b/source/glest_game/type_instances/upgrade.cpp
index 11bb2bdc8..a6a104376 100644
--- a/source/glest_game/type_instances/upgrade.cpp
+++ b/source/glest_game/type_instances/upgrade.cpp
@@ -32,7 +32,7 @@
 using namespace std;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/type_instances/upgrade.h b/source/glest_game/type_instances/upgrade.h
index 68524e195..66b215189 100644
--- a/source/glest_game/type_instances/upgrade.h
+++ b/source/glest_game/type_instances/upgrade.h
@@ -42,7 +42,7 @@ using std::vector;
 using std::map;
 using Shared::Xml::XmlNode;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class Unit;
diff --git a/source/glest_game/types/command_type.cpp b/source/glest_game/types/command_type.cpp
index 05b5e7aeb..772d4f9a1 100644
--- a/source/glest_game/types/command_type.cpp
+++ b/source/glest_game/types/command_type.cpp
@@ -37,7 +37,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 
diff --git a/source/glest_game/types/command_type.h b/source/glest_game/types/command_type.h
index e7a5ab12f..193b582be 100644
--- a/source/glest_game/types/command_type.h
+++ b/source/glest_game/types/command_type.h
@@ -34,7 +34,7 @@
 #   include "sound_container.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Util::MultiFactory;
diff --git a/source/glest_game/types/damage_multiplier.cpp b/source/glest_game/types/damage_multiplier.cpp
index b49bd16c2..61cf57d1b 100644
--- a/source/glest_game/types/damage_multiplier.cpp
+++ b/source/glest_game/types/damage_multiplier.cpp
@@ -24,7 +24,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		void AttackType::saveGame(XmlNode * rootNode) {
diff --git a/source/glest_game/types/damage_multiplier.h b/source/glest_game/types/damage_multiplier.h
index 4e5beaca4..0b61f0680 100644
--- a/source/glest_game/types/damage_multiplier.h
+++ b/source/glest_game/types/damage_multiplier.h
@@ -32,7 +32,7 @@
 using std::string;
 using Shared::Xml::XmlNode;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ===============================
diff --git a/source/glest_game/types/element_type.cpp b/source/glest_game/types/element_type.cpp
index 50f9a58b6..51488136d 100644
--- a/source/glest_game/types/element_type.cpp
+++ b/source/glest_game/types/element_type.cpp
@@ -33,7 +33,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/types/element_type.h b/source/glest_game/types/element_type.h
index 9634f6895..e939a0d95 100644
--- a/source/glest_game/types/element_type.h
+++ b/source/glest_game/types/element_type.h
@@ -36,7 +36,7 @@ using std::string;
 
 using Shared::Graphics::Texture2D;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class UpgradeType;
diff --git a/source/glest_game/types/faction_type.cpp b/source/glest_game/types/faction_type.cpp
index d0db58be9..fabae0d73 100644
--- a/source/glest_game/types/faction_type.cpp
+++ b/source/glest_game/types/faction_type.cpp
@@ -33,7 +33,7 @@
 using namespace Shared::Util;
 using namespace Shared::Xml;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// ======================================================
diff --git a/source/glest_game/types/faction_type.h b/source/glest_game/types/faction_type.h
index c8676adce..57a0c75b9 100644
--- a/source/glest_game/types/faction_type.h
+++ b/source/glest_game/types/faction_type.h
@@ -36,7 +36,7 @@
 
 using Shared::Sound::StrSound;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		// =====================================================
 		//      class FactionType
diff --git a/source/glest_game/types/object_type.cpp b/source/glest_game/types/object_type.cpp
index 9a98b892f..cf0517f20 100644
--- a/source/glest_game/types/object_type.cpp
+++ b/source/glest_game/types/object_type.cpp
@@ -22,7 +22,7 @@
 #include "renderer.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/types/object_type.h b/source/glest_game/types/object_type.h
index cd3f9ff8a..a9a9ddcb8 100644
--- a/source/glest_game/types/object_type.h
+++ b/source/glest_game/types/object_type.h
@@ -34,7 +34,7 @@
 
 using std::vector;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::Model;
diff --git a/source/glest_game/types/projectile_type.cpp b/source/glest_game/types/projectile_type.cpp
index 9f962296d..8963acfd1 100644
--- a/source/glest_game/types/projectile_type.cpp
+++ b/source/glest_game/types/projectile_type.cpp
@@ -25,7 +25,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		ProjectileType::ProjectileType() {
diff --git a/source/glest_game/types/projectile_type.h b/source/glest_game/types/projectile_type.h
index 9ae852b77..28dddaae0 100644
--- a/source/glest_game/types/projectile_type.h
+++ b/source/glest_game/types/projectile_type.h
@@ -38,7 +38,7 @@
 using std::vector;
 using std::string;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		// =====================================================
 		//      class ProjectileType
diff --git a/source/glest_game/types/resource_type.cpp b/source/glest_game/types/resource_type.cpp
index 97f64143c..6ebbe2c93 100644
--- a/source/glest_game/types/resource_type.cpp
+++ b/source/glest_game/types/resource_type.cpp
@@ -32,7 +32,7 @@
 using namespace Shared::Util;
 using namespace Shared::Xml;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/types/resource_type.h b/source/glest_game/types/resource_type.h
index f3cd56b17..4ee0e0d3d 100644
--- a/source/glest_game/types/resource_type.h
+++ b/source/glest_game/types/resource_type.h
@@ -32,7 +32,7 @@
 #   include "unit_particle_type.h"
 #   include "object_type.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::Model;
diff --git a/source/glest_game/types/skill_type.cpp b/source/glest_game/types/skill_type.cpp
index 1a7603722..7159a7f47 100644
--- a/source/glest_game/types/skill_type.cpp
+++ b/source/glest_game/types/skill_type.cpp
@@ -36,7 +36,7 @@
 using namespace Shared::Util;
 using namespace Shared::Graphics;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		int SkillType::nextAttackBoostId = 0;
diff --git a/source/glest_game/types/skill_type.h b/source/glest_game/types/skill_type.h
index 03409b254..3d7ec73a2 100644
--- a/source/glest_game/types/skill_type.h
+++ b/source/glest_game/types/skill_type.h
@@ -45,7 +45,7 @@ using Shared::Xml::XmlNode;
 using Shared::Graphics::Vec3f;
 using Shared::Graphics::Model;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Util::MultiFactory;
diff --git a/source/glest_game/types/tech_tree.cpp b/source/glest_game/types/tech_tree.cpp
index 60de7c30d..a3b6c164c 100644
--- a/source/glest_game/types/tech_tree.cpp
+++ b/source/glest_game/types/tech_tree.cpp
@@ -35,7 +35,7 @@
 using namespace Shared::Util;
 using namespace Shared::Xml;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/types/tech_tree.h b/source/glest_game/types/tech_tree.h
index e4c7fd378..aaa70c86f 100644
--- a/source/glest_game/types/tech_tree.h
+++ b/source/glest_game/types/tech_tree.h
@@ -32,7 +32,7 @@
 #   include "damage_multiplier.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/types/tileset_model_type.cpp b/source/glest_game/types/tileset_model_type.cpp
index 00e9b3187..bc6f38b15 100644
--- a/source/glest_game/types/tileset_model_type.cpp
+++ b/source/glest_game/types/tileset_model_type.cpp
@@ -20,7 +20,7 @@
 #include "tileset_model_type.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/types/tileset_model_type.h b/source/glest_game/types/tileset_model_type.h
index e3bd689fe..2af9a098b 100644
--- a/source/glest_game/types/tileset_model_type.h
+++ b/source/glest_game/types/tileset_model_type.h
@@ -33,7 +33,7 @@
 
 using std::vector;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::Model;
diff --git a/source/glest_game/types/unit_type.cpp b/source/glest_game/types/unit_type.cpp
index 624dbb8a8..f93855d9a 100644
--- a/source/glest_game/types/unit_type.cpp
+++ b/source/glest_game/types/unit_type.cpp
@@ -43,7 +43,7 @@ using namespace Shared::Xml;
 using namespace Shared::Graphics;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		auto_ptr < CommandType >
diff --git a/source/glest_game/types/unit_type.h b/source/glest_game/types/unit_type.h
index 086206d7b..31e81873a 100644
--- a/source/glest_game/types/unit_type.h
+++ b/source/glest_game/types/unit_type.h
@@ -35,7 +35,7 @@
 #   include "common_scoped_ptr.h"
 #   include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Sound::StaticSound;
diff --git a/source/glest_game/types/upgrade_type.cpp b/source/glest_game/types/upgrade_type.cpp
index 4fafdbd06..b8812be08 100644
--- a/source/glest_game/types/upgrade_type.cpp
+++ b/source/glest_game/types/upgrade_type.cpp
@@ -39,7 +39,7 @@
 using namespace Shared::Util;
 using namespace Shared::Xml;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/types/upgrade_type.h b/source/glest_game/types/upgrade_type.h
index 678351d72..c132a3af8 100644
--- a/source/glest_game/types/upgrade_type.h
+++ b/source/glest_game/types/upgrade_type.h
@@ -44,7 +44,7 @@ using Shared::Util::Checksum;
 using namespace Shared::Util;
 using namespace Shared::Xml;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class TechTree;
diff --git a/source/glest_game/world/map.cpp b/source/glest_game/world/map.cpp
index 6ac14fa22..25b013813 100644
--- a/source/glest_game/world/map.cpp
+++ b/source/glest_game/world/map.cpp
@@ -41,7 +41,7 @@ using namespace Shared::Graphics;
 using namespace Shared::Util;
 using namespace Shared::Platform;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/world/map.h b/source/glest_game/world/map.h
index e8edc4800..23a9eab26 100644
--- a/source/glest_game/world/map.h
+++ b/source/glest_game/world/map.h
@@ -39,7 +39,7 @@
 #include "leak_dumper.h"
 
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::Vec4f;
diff --git a/source/glest_game/world/minimap.cpp b/source/glest_game/world/minimap.cpp
index 0a0e1e403..e300d5b85 100644
--- a/source/glest_game/world/minimap.cpp
+++ b/source/glest_game/world/minimap.cpp
@@ -31,7 +31,7 @@
 
 using namespace Shared::Graphics;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/world/minimap.h b/source/glest_game/world/minimap.h
index c3c0bcea4..57cc87976 100644
--- a/source/glest_game/world/minimap.h
+++ b/source/glest_game/world/minimap.h
@@ -30,7 +30,7 @@
 #include "xml_parser.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::Vec4f;
diff --git a/source/glest_game/world/scenario.cpp b/source/glest_game/world/scenario.cpp
index 8fae82576..d3520571d 100644
--- a/source/glest_game/world/scenario.cpp
+++ b/source/glest_game/world/scenario.cpp
@@ -39,7 +39,7 @@ using namespace Shared::Util;
 using namespace Shared::PlatformCommon;
 using namespace std;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/world/scenario.h b/source/glest_game/world/scenario.h
index 3dd9bb121..e5b2531e5 100644
--- a/source/glest_game/world/scenario.h
+++ b/source/glest_game/world/scenario.h
@@ -40,7 +40,7 @@ using std::pair;
 using Shared::Xml::XmlNode;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		enum Difficulty {
diff --git a/source/glest_game/world/surface_atlas.cpp b/source/glest_game/world/surface_atlas.cpp
index ea15b7c0e..c3bf6e630 100644
--- a/source/glest_game/world/surface_atlas.cpp
+++ b/source/glest_game/world/surface_atlas.cpp
@@ -31,7 +31,7 @@ using namespace std;
 using namespace Shared::Util;
 using namespace Shared::Graphics;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/world/surface_atlas.h b/source/glest_game/world/surface_atlas.h
index 771d7dff7..231b8db7b 100644
--- a/source/glest_game/world/surface_atlas.h
+++ b/source/glest_game/world/surface_atlas.h
@@ -38,7 +38,7 @@ using Shared::Graphics::Texture2D;
 using Shared::Graphics::Vec2i;
 using Shared::Graphics::Vec2f;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/world/tileset.cpp b/source/glest_game/world/tileset.cpp
index f6547d9cd..436da2c32 100644
--- a/source/glest_game/world/tileset.cpp
+++ b/source/glest_game/world/tileset.cpp
@@ -35,7 +35,7 @@ using namespace Shared::Util;
 using namespace Shared::Xml;
 using namespace Shared::Graphics;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		const float Tileset::standardAirHeight = 5.0f;
 		const float Tileset::standardShadowIntensity = 0.2f;
diff --git a/source/glest_game/world/tileset.h b/source/glest_game/world/tileset.h
index 6c6969fbe..e76751109 100644
--- a/source/glest_game/world/tileset.h
+++ b/source/glest_game/world/tileset.h
@@ -35,7 +35,7 @@
 #include "checksum.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Xml::XmlNode;
diff --git a/source/glest_game/world/time_flow.cpp b/source/glest_game/world/time_flow.cpp
index b222df033..ff01f6fe7 100644
--- a/source/glest_game/world/time_flow.cpp
+++ b/source/glest_game/world/time_flow.cpp
@@ -28,7 +28,7 @@
 
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/world/time_flow.h b/source/glest_game/world/time_flow.h
index 85d6e77c7..e015297ad 100644
--- a/source/glest_game/world/time_flow.h
+++ b/source/glest_game/world/time_flow.h
@@ -29,7 +29,7 @@
 #include "sound.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Sound::StrSound;
diff --git a/source/glest_game/world/unit_updater.cpp b/source/glest_game/world/unit_updater.cpp
index db9c89572..5d03bb98b 100644
--- a/source/glest_game/world/unit_updater.cpp
+++ b/source/glest_game/world/unit_updater.cpp
@@ -42,7 +42,7 @@
 using namespace Shared::Graphics;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/world/unit_updater.h b/source/glest_game/world/unit_updater.h
index e7d05da9b..bc6ea2ad7 100644
--- a/source/glest_game/world/unit_updater.h
+++ b/source/glest_game/world/unit_updater.h
@@ -34,7 +34,7 @@
 using Shared::Graphics::ParticleObserver;
 using Shared::Util::RandomGen;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class Unit;
diff --git a/source/glest_game/world/water_effects.cpp b/source/glest_game/world/water_effects.cpp
index 5be0ff862..9b930f9ca 100644
--- a/source/glest_game/world/water_effects.cpp
+++ b/source/glest_game/world/water_effects.cpp
@@ -23,7 +23,7 @@
 #include "map.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/world/water_effects.h b/source/glest_game/world/water_effects.h
index 8d5eaf6f6..1d4fb12df 100644
--- a/source/glest_game/world/water_effects.h
+++ b/source/glest_game/world/water_effects.h
@@ -33,7 +33,7 @@ using std::vector;
 
 using Shared::Graphics::Vec2f;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		class Map;
diff --git a/source/glest_game/world/world.cpp b/source/glest_game/world/world.cpp
index d16ddb81a..fbd130143 100644
--- a/source/glest_game/world/world.cpp
+++ b/source/glest_game/world/world.cpp
@@ -39,7 +39,7 @@
 using namespace Shared::Graphics;
 using namespace Shared::Util;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		// =====================================================
diff --git a/source/glest_game/world/world.h b/source/glest_game/world/world.h
index 16c6cc878..2adbebd8e 100644
--- a/source/glest_game/world/world.h
+++ b/source/glest_game/world/world.h
@@ -45,7 +45,7 @@
 #include "game_constants.h"
 #include "leak_dumper.h"
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 
 		using Shared::Graphics::Quad2i;
diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp
index 0273a7f0b..defe6b99c 100644
--- a/source/glest_map_editor/main.cpp
+++ b/source/glest_map_editor/main.cpp
@@ -36,10 +36,10 @@
 using namespace Shared;
 using namespace Shared::Util;
 using namespace Shared::PlatformCommon;
-using namespace Glest::Game;
+using namespace ZetaGlest::Game;
 using namespace std;
 
-namespace Glest {
+namespace ZetaGlest {
 	namespace Game {
 		string getGameReadWritePath(const string &lookupKey) {
 			string path = "";
@@ -253,7 +253,7 @@ namespace MapEditor {
 		}
 		menuBar->Append(menuBrushGradient, wxT("&Gradient"));
 
-		// Glest height brush
+		// height brush
 		menuBrushHeight = new wxMenu();
 		for (int i = 0; i < heightCount; ++i) {
 			menuBrushHeight->AppendCheckItem(miBrushHeight + i + 1, ToUnicode((i > 4 ? "&" : "") + intToStr(i - heightCount / 2)));
diff --git a/source/shared_lib/include/sound/openal/sound_player_openal.h b/source/shared_lib/include/sound/openal/sound_player_openal.h
index 7d4e89cee..d78f7ec29 100644
--- a/source/shared_lib/include/sound/openal/sound_player_openal.h
+++ b/source/shared_lib/include/sound/openal/sound_player_openal.h
@@ -1,10 +1,22 @@
-//This file is part of Glest Shared Library (www.glest.org)
-//Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+// This file is part of ZetaGlest <https://github.com/ZetaGlest>
+//
+// Copyright (C) 2018  The ZetaGlest team
+//
+// ZetaGlest is a fork of MegaGlest <https://megaglest.org>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>
 
-//You can redistribute this code and/or modify it under
-//the terms of the GNU General Public License as published by the Free Software
-//Foundation; either version 2 of the License, or (at your option) any later
-//version.
 #ifndef _SHARED_SOUND_SOUNDPLAYEROPENAL_H_
 #define _SHARED_SOUND_SOUNDPLAYEROPENAL_H_
 
diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
index e358195fb..d27ea6884 100644
--- a/source/shared_lib/sources/platform/posix/socket.cpp
+++ b/source/shared_lib/sources/platform/posix/socket.cpp
@@ -2529,15 +2529,15 @@ namespace Shared {
 				//int ports[4] = { this->getExternalPort(), this->getBindPort(), this->getFTPServerPort(), this->getFTPServerPort() };
 				std::vector<int> UPNPPortForwardList;
 
-				// Glest Game Server port
+				// Game Server port
 				UPNPPortForwardList.push_back(this->getExternalPort());
 				UPNPPortForwardList.push_back(this->getBindPort());
 
-				// Glest mini FTP Server Listen Port
+				// mini FTP Server Listen Port
 				UPNPPortForwardList.push_back(this->getFTPServerPort());
 				UPNPPortForwardList.push_back(this->getFTPServerPort());
 
-				// GLest mini FTP Server Passive file TRansfer ports (1 per game player)
+				// mini FTP Server Passive file TRansfer ports (1 per game player)
 				for (int clientIndex = 1; clientIndex <= ServerSocket::maxPlayerCount; ++clientIndex) {
 					UPNPPortForwardList.push_back(this->getFTPServerPort() + clientIndex);
 					UPNPPortForwardList.push_back(this->getFTPServerPort() + clientIndex);