diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index aa420ae41..eccbfaabe 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -470,7 +470,7 @@ MainWindow::MainWindow(	std::pair<string,vector<string> > unitToLoad,
 	//@="blergcorp.blergapp.v1"
 
 	//Open the registry key.
-	wstring subKey = L"Software\\Classes\\megaglest.g3d\\shell\\open\\command";
+	wstring subKey = L"Software\\Classes\\zetaglest.g3d\\shell\\open\\command";
 	HKEY keyHandle;
 	DWORD dwDisposition;
 	RegCreateKeyEx(HKEY_CURRENT_USER,subKey.c_str(),0, NULL, 0, KEY_ALL_ACCESS, NULL, &keyHandle, &dwDisposition);
@@ -485,7 +485,7 @@ MainWindow::MainWindow(	std::pair<string,vector<string> > unitToLoad,
 	subKey = L"Software\\Classes\\.g3d";
 	RegCreateKeyEx(HKEY_CURRENT_USER,subKey.c_str(),0, NULL, 0, KEY_ALL_ACCESS, NULL, &keyHandle, &dwDisposition);
 	//Set the value.
-	launchApp = L"megaglest.g3d";
+	launchApp = L"zetaglest.g3d";
 	len = (launchApp.size() + 1) * sizeof(wchar_t);
 	RegSetValueEx(keyHandle, NULL, 0, REG_SZ, (PBYTE)launchApp.c_str(), len);
 	RegCloseKey(keyHandle);
@@ -910,10 +910,10 @@ void MainWindow::onMenuFileLoadParticleXML(wxCommandEvent &event){
 		fileDialog->SetWildcard(wxT("XML files (*.xml)|*.xml"));
 
 		if(isControlKeyPressed == true) {
-			fileDialog->SetMessage(wxT("Adding Mega-Glest particle to current view."));
+			fileDialog->SetMessage(wxT("Adding ZetaGlest particle to current view."));
 		}
 		else {
-			fileDialog->SetMessage(wxT("Selecting Mega-Glest particle for current view."));
+			fileDialog->SetMessage(wxT("Selecting ZetaGlest particle for current view."));
 		}
 
 		if(fileDialog->ShowModal()==wxID_OK){
@@ -944,10 +944,10 @@ void MainWindow::onMenuFileLoadProjectileParticleXML(wxCommandEvent &event){
 		fileDialog->SetWildcard(wxT("XML files (*.xml)|*.xml"));
 
 		if(isControlKeyPressed == true) {
-			fileDialog->SetMessage(wxT("Adding Mega-Glest projectile particle to current view."));
+			fileDialog->SetMessage(wxT("Adding ZetaGlest projectile particle to current view."));
 		}
 		else {
-			fileDialog->SetMessage(wxT("Selecting Mega-Glest projectile particle for current view."));
+			fileDialog->SetMessage(wxT("Selecting ZetaGlest projectile particle for current view."));
 		}
 
 		if(fileDialog->ShowModal()==wxID_OK){
@@ -978,10 +978,10 @@ void MainWindow::onMenuFileLoadSplashParticleXML(wxCommandEvent &event){
 		fileDialog->SetWildcard(wxT("XML files (*.xml)|*.xml"));
 
 		if(isControlKeyPressed == true) {
-			fileDialog->SetMessage(wxT("Adding Mega-Glest splash particle to current view."));
+			fileDialog->SetMessage(wxT("Adding ZetaGlest splash particle to current view."));
 		}
 		else {
-			fileDialog->SetMessage(wxT("Selecting Mega-Glest splash particle for current view."));
+			fileDialog->SetMessage(wxT("Selecting ZetaGlest splash particle for current view."));
 		}
 
 		if(fileDialog->ShowModal()==wxID_OK){
@@ -1291,7 +1291,7 @@ void MainWindow::loadUnit(string path, string skillName) {
 	}
 	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 ZetaGlest particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
 	}
 }
 
@@ -1549,7 +1549,7 @@ void MainWindow::loadProjectileParticle(string path) {
 	}
 	catch(std::runtime_error &e) {
 		std::cout << e.what() << std::endl;
-		wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a Mega-Glest projectile particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
+		wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a ZetaGlest projectile particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
 	}
 	if(timer) timer->Start(100);
 	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] after load [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,path.c_str());
@@ -1656,7 +1656,7 @@ void MainWindow::loadSplashParticle(string path) {  // uses ParticleSystemTypeSp
 	}
 	catch(std::runtime_error &e) {
 		std::cout << e.what() << std::endl;
-		wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a Mega-Glest projectile particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
+		wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a ZetaGlest projectile particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
 	}
 	if(timer) timer->Start(100);
 	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] after load [%s] particleSplashPathList.size() = " MG_SIZE_T_SPECIFIER "\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,path.c_str(),this->particleSplashPathList.size());
diff --git a/source/g3d_viewer/renderer.cpp b/source/g3d_viewer/renderer.cpp
index fb9673dc1..a8a09d44d 100644
--- a/source/g3d_viewer/renderer.cpp
+++ b/source/g3d_viewer/renderer.cpp
@@ -158,7 +158,7 @@ void Renderer::checkGlCaps() {
 
 		message += "Your system supports OpenGL version \"";
  		message += getGlVersion() + string("\"\n");
- 		message += "MegaGlest needs a version that supports\n";
+ 		message += "ZetaGlest needs a version that supports\n";
  		message += "glActiveTexture (OpenGL 1.3) or the ARB_multitexture extension.";
 
  		throw megaglest_runtime_error(message.c_str());
@@ -171,7 +171,7 @@ void Renderer::checkGlCaps() {
 
 		message += "Your system supports OpenGL version \"";
  		message += getGlVersion() + string("\"\n");
- 		message += "MegaGlest needs at least version 1.3 to work\n";
+ 		message += "ZetaGlest needs at least version 1.3 to work\n";
  		message += "You may solve this problem by installing your latest video card drivers";
 
  		throw megaglest_runtime_error(message.c_str());
@@ -180,7 +180,7 @@ void Renderer::checkGlCaps() {
 	//opengl 1.4 or extension
 	//if(isGlVersionSupported(1, 4, 0) == false) {
 	if(glewIsSupported("GL_VERSION_1_4") == false) {
-		checkExtension("GL_ARB_texture_env_crossbar", "MegaGlest");
+		checkExtension("GL_ARB_texture_env_crossbar", "ZetaGlest");
 	}
 }
 
diff --git a/source/glest_game/ai/ai.cpp b/source/glest_game/ai/ai.cpp
index e6d6c08d5..207dd37f3 100644
--- a/source/glest_game/ai/ai.cpp
+++ b/source/glest_game/ai/ai.cpp
@@ -380,14 +380,14 @@ namespace
           //printf("Discovered overriden static value for AI, minMinWarriorsExpandCpuEasy = %d\n",minMinWarriorsExpandCpuEasy);
         }
       if (faction->
-          getAIBehaviorStaticOverideValue (aibsvcMinMinWarriorsExpandCpuMega)
+          getAIBehaviorStaticOverideValue (aibsvcMinMinWarriorsExpandCpuZeta)
           != INT_MAX)
         {
-          minMinWarriorsExpandCpuMega =
+          minMinWarriorsExpandCpuZeta =
             faction->
             getAIBehaviorStaticOverideValue
-            (aibsvcMinMinWarriorsExpandCpuMega);
-          //printf("Discovered overriden static value for AI, minMinWarriorsExpandCpuMega = %d\n",minMinWarriorsExpandCpuMega);
+            (aibsvcMinMinWarriorsExpandCpuZeta);
+          //printf("Discovered overriden static value for AI, minMinWarriorsExpandCpuZeta = %d\n",minMinWarriorsExpandCpuZeta);
         }
       if (faction->
           getAIBehaviorStaticOverideValue (aibsvcMinMinWarriorsExpandCpuUltra)
@@ -1244,9 +1244,9 @@ namespace
                                ctNetworkCpuUltra)
         && random.randRange (0, 2) == 1;
       bool
-        megaResourceAttack = (aiInterface->getControlType () == ctCpuMega
+        megaResourceAttack = (aiInterface->getControlType () == ctCpuZeta
                               || aiInterface->getControlType () ==
-                              ctNetworkCpuMega)
+                              ctNetworkCpuZeta)
         && random.randRange (0, 1) == 1;
 
       if (megaResourceAttack || ultraResourceAttack)
@@ -1384,8 +1384,8 @@ namespace
           const AttackCommandType *
             act = unit->getType ()->getFirstAttackCommand (field);
 
-          if (aiInterface->getControlType () == ctCpuMega ||
-              aiInterface->getControlType () == ctNetworkCpuMega)
+          if (aiInterface->getControlType () == ctCpuZeta ||
+              aiInterface->getControlType () == ctNetworkCpuZeta)
             {
               if (producerWarriorCount > maxProducerWarriors)
                 {
@@ -1430,9 +1430,9 @@ namespace
           if (alreadyAttacking == false
               && unit->getType ()->hasSkillClass (scAttack)
               && (aiInterface->getControlType () == ctCpuUltra
-                  || aiInterface->getControlType () == ctCpuMega
+                  || aiInterface->getControlType () == ctCpuZeta
                   || aiInterface->getControlType () == ctNetworkCpuUltra
-                  || aiInterface->getControlType () == ctNetworkCpuMega))
+                  || aiInterface->getControlType () == ctNetworkCpuZeta))
             {
               //printf("~~~~~~~~ Unit [%s - %d] checking if unit is being attacked\n",unit->getFullName().c_str(),unit->getId());
 
@@ -1539,9 +1539,9 @@ namespace
                     }
                 }
 
-              // Mega CPU does not send ( far away ) units which are currently producing something
-              if (aiInterface->getControlType () == ctCpuMega
-                  || aiInterface->getControlType () == ctNetworkCpuMega)
+              // Zeta CPU does not send ( far away ) units which are currently producing something
+              if (aiInterface->getControlType () == ctCpuZeta
+                  || aiInterface->getControlType () == ctNetworkCpuZeta)
                 {
                   if (!isWarrior)
                     {
@@ -1570,10 +1570,10 @@ namespace
         {
           minWarriors += minMinWarriorsExpandCpuEasy;
         }
-      else if (aiInterface->getControlType () == ctCpuMega ||
-               aiInterface->getControlType () == ctNetworkCpuMega)
+      else if (aiInterface->getControlType () == ctCpuZeta ||
+               aiInterface->getControlType () == ctNetworkCpuZeta)
         {
-          minWarriors += minMinWarriorsExpandCpuMega;
+          minWarriors += minMinWarriorsExpandCpuZeta;
           if (minWarriors > maxMinWarriors - 1 || randomMinWarriorsReached)
             {
               randomMinWarriorsReached = true;
@@ -2035,9 +2035,9 @@ namespace
       aiNode->addAttribute ("minMinWarriorsExpandCpuEasy",
                             intToStr (minMinWarriorsExpandCpuEasy),
                             mapTagReplacements);
-//      int minMinWarriorsExpandCpuMega;
-      aiNode->addAttribute ("minMinWarriorsExpandCpuMega",
-                            intToStr (minMinWarriorsExpandCpuMega),
+//      int minMinWarriorsExpandCpuZeta;
+      aiNode->addAttribute ("minMinWarriorsExpandCpuZeta",
+                            intToStr (minMinWarriorsExpandCpuZeta),
                             mapTagReplacements);
 //      int minMinWarriorsExpandCpuUltra;
       aiNode->addAttribute ("minMinWarriorsExpandCpuUltra",
@@ -2138,9 +2138,9 @@ namespace
       //      int minMinWarriorsExpandCpuEasy;
       minMinWarriorsExpandCpuEasy =
         aiNode->getAttribute ("minMinWarriorsExpandCpuEasy")->getIntValue ();
-      //      int minMinWarriorsExpandCpuMega;
-      minMinWarriorsExpandCpuMega =
-        aiNode->getAttribute ("minMinWarriorsExpandCpuMega")->getIntValue ();
+      //      int minMinWarriorsExpandCpZeta;
+      minMinWarriorsExpandCpuZeta =
+        aiNode->getAttribute ("minMinWarriorsExpandCpuZeta")->getIntValue ();
       //      int minMinWarriorsExpandCpuUltra;
       minMinWarriorsExpandCpuUltra =
         aiNode->getAttribute ("minMinWarriorsExpandCpuUltra")->getIntValue ();
diff --git a/source/glest_game/ai/ai.h b/source/glest_game/ai/ai.h
index 22826b46b..19b108c91 100644
--- a/source/glest_game/ai/ai.h
+++ b/source/glest_game/ai/ai.h
@@ -239,7 +239,7 @@ namespace
       int
         minMinWarriorsExpandCpuEasy;
       int
-        minMinWarriorsExpandCpuMega;
+        minMinWarriorsExpandCpuZeta;
       int
         minMinWarriorsExpandCpuUltra;
       int
@@ -312,7 +312,7 @@ namespace
         maxBuildRadius = 40;
         minMinWarriors = 7;
         minMinWarriorsExpandCpuEasy = 1;
-        minMinWarriorsExpandCpuMega = 3;
+        minMinWarriorsExpandCpuZeta = 3;
         minMinWarriorsExpandCpuUltra = 3;
         minMinWarriorsExpandCpuNormal = 3;
         maxMinWarriors = 20;
diff --git a/source/glest_game/ai/ai_interface.cpp b/source/glest_game/ai/ai_interface.cpp
index 2c487d24f..cea7b00d2 100644
--- a/source/glest_game/ai/ai_interface.cpp
+++ b/source/glest_game/ai/ai_interface.cpp
@@ -372,7 +372,7 @@ namespace
                                        "]");
             }
           fprintf (fp,
-                   "MegaGlest AI log file for Tech [%s] Faction [%s] #%d\n\n",
+                   "ZetaGlest AI log file for Tech [%s] Faction [%s] #%d\n\n",
                    this->gameSettings->getTech ().c_str (),
                    this->world->getFaction (this->factionIndex)->getType ()->
                    getName ().c_str (), this->factionIndex);
diff --git a/source/glest_game/ai/ai_rule.cpp b/source/glest_game/ai/ai_rule.cpp
index bdd8011fd..173f46eb1 100644
--- a/source/glest_game/ai/ai_rule.cpp
+++ b/source/glest_game/ai/ai_rule.cpp
@@ -577,8 +577,8 @@ namespace
       // The following rules are specific creation rules for different AI.
       else
         {
-          if (ai->getAiInterface ()->getControlType () == ctCpuMega ||
-              ai->getAiInterface ()->getControlType () == ctNetworkCpuMega)
+          if (ai->getAiInterface ()->getControlType () == ctCpuZeta ||
+              ai->getAiInterface ()->getControlType () == ctNetworkCpuZeta)
             {
               if (ai->outputAIBehaviourToConsole ())
                 printf
@@ -2007,9 +2007,9 @@ namespace
                   producers = idle_producers;
                 }
 
-              if (aiInterface->getControlType () == ctCpuMega ||
-                  aiInterface->getControlType () == ctNetworkCpuMega)
-                {               // mega cpu trys to balance the commands to the producers
+              if (aiInterface->getControlType () == ctCpuZeta ||
+                  aiInterface->getControlType () == ctNetworkCpuZeta)
+                {               // zeta cpu trys to balance the commands to the producers
                   int
                     randomstart =
                     ai->getRandom ()->randRange (0,
@@ -2299,7 +2299,7 @@ namespace
 
                                   if (ai->outputAIBehaviourToConsole ())
                                     printf
-                                      ("mega #1 produceSpecific giveCommand to unit [%s] commandType [%s]\n",
+                                      ("zeta #1 produceSpecific giveCommand to unit [%s] commandType [%s]\n",
                                        aiInterface->getMyUnit (bestIndex)->
                                        getType ()->getName ().c_str (),
                                        ut->getCommandType (commandIndex)->
@@ -2310,7 +2310,7 @@ namespace
                                       char
                                         szBuf[8096] = "";
                                       snprintf (szBuf, 8096,
-                                                "mega #1 produceSpecific giveCommand to unit [%s] commandType [%s]",
+                                                "zeta #1 produceSpecific giveCommand to unit [%s] commandType [%s]",
                                                 aiInterface->
                                                 getMyUnit (bestIndex)->
                                                 getType ()->getName ().
@@ -2375,7 +2375,7 @@ namespace
 
                               if (ai->outputAIBehaviourToConsole ())
                                 printf
-                                  ("mega #2 produceSpecific giveCommand to unit [%s] commandType [%s]\n",
+                                  ("zeta #2 produceSpecific giveCommand to unit [%s] commandType [%s]\n",
                                    aiInterface->getMyUnit (bestIndex)->
                                    getType ()->getName ().c_str (),
                                    (defCt !=
@@ -2386,7 +2386,7 @@ namespace
                                   char
                                     szBuf[8096] = "";
                                   snprintf (szBuf, 8096,
-                                            "mega #2 produceSpecific giveCommand to unit [%s] commandType [%s]",
+                                            "zeta #2 produceSpecific giveCommand to unit [%s] commandType [%s]",
                                             aiInterface->
                                             getMyUnit (bestIndex)->
                                             getType ()->getName ().c_str (),
@@ -2448,7 +2448,7 @@ namespace
 
                               if (ai->outputAIBehaviourToConsole ())
                                 printf
-                                  ("mega #3 produceSpecific giveCommand to unit [%s] commandType [%s]\n",
+                                  ("zeta #3 produceSpecific giveCommand to unit [%s] commandType [%s]\n",
                                    aiInterface->getMyUnit (bestIndex)->
                                    getType ()->getName ().c_str (),
                                    (defCt !=
@@ -2459,7 +2459,7 @@ namespace
                                   char
                                     szBuf[8096] = "";
                                   snprintf (szBuf, 8096,
-                                            "mega #3 produceSpecific giveCommand to unit [%s] commandType [%s]",
+                                            "zeta #3 produceSpecific giveCommand to unit [%s] commandType [%s]",
                                             aiInterface->
                                             getMyUnit (bestIndex)->
                                             getType ()->getName ().c_str (),
@@ -2512,7 +2512,7 @@ namespace
                             }
                           if (ai->outputAIBehaviourToConsole ())
                             printf
-                              ("mega #4 produceSpecific giveCommand to unit [%s] commandType [%s]\n",
+                              ("zeta #4 produceSpecific giveCommand to unit [%s] commandType [%s]\n",
                                aiInterface->getMyUnit (bestIndex)->
                                getType ()->getName ().c_str (),
                                (defCt !=
@@ -2522,7 +2522,7 @@ namespace
                               char
                                 szBuf[8096] = "";
                               snprintf (szBuf, 8096,
-                                        "mega #4 produceSpecific giveCommand to unit [%s] commandType [%s]",
+                                        "zeta #4 produceSpecific giveCommand to unit [%s] commandType [%s]",
                                         aiInterface->getMyUnit (bestIndex)->
                                         getType ()->getName ().c_str (),
                                         (defCt !=
diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp
index 2412a9b2e..3e96e1e82 100644
--- a/source/glest_game/game/game.cpp
+++ b/source/glest_game/game/game.cpp
@@ -4849,7 +4849,7 @@ namespace Glest
                faction->getControlType () == ctNetworkCpuEasy ||
                faction->getControlType () == ctNetworkCpu ||
                faction->getControlType () == ctNetworkCpuUltra ||
-               faction->getControlType () == ctNetworkCpuMega))
+               faction->getControlType () == ctNetworkCpuZeta))
           {
 
             if (aiInterfaces[i] == NULL &&
@@ -8527,8 +8527,8 @@ namespace Glest
         case ctCpuUltra:
           factionInfo += " CPU Ultra" + multiplier;
           break;
-        case ctCpuMega:
-          factionInfo += " CPU Mega" + multiplier;
+        case ctCpuZeta:
+          factionInfo += " CPU Zeta" + multiplier;
           break;
         }
 
@@ -9918,7 +9918,7 @@ namespace Glest
         std::map < string, string > mapTagReplacements;
         XmlTree xmlTreeSaveGame (XML_RAPIDXML_ENGINE);
 
-        xmlTreeSaveGame.init ("megaglest-saved-game");
+        xmlTreeSaveGame.init ("zetaglest-saved-game");
         XmlNode *rootNodeReplay = xmlTreeSaveGame.getRootNode ();
 
         //std::map<string,string> mapTagReplacements;
@@ -9956,7 +9956,7 @@ namespace Glest
       }
 
       XmlTree xmlTree;
-      xmlTree.init ("megaglest-saved-game");
+      xmlTree.init ("zetaglest-saved-game");
       XmlNode *rootNode = xmlTree.getRootNode ();
 
       std::map < string, string > mapTagReplacements;
@@ -10201,12 +10201,12 @@ namespace Glest
 
         const XmlNode *rootNode = xmlTreeReplay.getRootNode ();
 
-        if (rootNode->hasChild ("megaglest-saved-game") == true)
+        if (rootNode->hasChild ("zetaglest-saved-game") == true)
         {
-          rootNode = rootNode->getChild ("megaglest-saved-game");
+          rootNode = rootNode->getChild ("zetaglest-saved-game");
         }
 
-        //const XmlNode *versionNode= rootNode->getChild("megaglest-saved-game");
+        //const XmlNode *versionNode= rootNode->getChild("zetaglest-saved-game");
         const XmlNode *versionNode = rootNode;
 
         Lang & lang = Lang::getInstance ();
@@ -10292,12 +10292,12 @@ namespace Glest
         printf ("After load of XML\n");
 
       const XmlNode *rootNode = xmlTree.getRootNode ();
-      if (rootNode->hasChild ("megaglest-saved-game") == true)
+      if (rootNode->hasChild ("zetaglest-saved-game") == true)
       {
-        rootNode = rootNode->getChild ("megaglest-saved-game");
+        rootNode = rootNode->getChild ("zetaglest-saved-game");
       }
 
-      //const XmlNode *versionNode= rootNode->getChild("megaglest-saved-game");
+      //const XmlNode *versionNode= rootNode->getChild("zetaglest-saved-game");
       const XmlNode *versionNode = rootNode;
 
       Lang & lang = Lang::getInstance ();
diff --git a/source/glest_game/game/game_constants.h b/source/glest_game/game/game_constants.h
index 00ccb5fc5..37c4ac51a 100644
--- a/source/glest_game/game/game_constants.h
+++ b/source/glest_game/game/game_constants.h
@@ -159,7 +159,7 @@ namespace
       ctCpuEasy,
       ctCpu,
       ctCpuUltra,
-      ctCpuMega,
+      ctCpuZeta,
       ctNetwork,
       ctNetworkUnassigned,
       ctHuman,
@@ -167,7 +167,7 @@ namespace
       ctNetworkCpuEasy,
       ctNetworkCpu,
       ctNetworkCpuUltra,
-      ctNetworkCpuMega
+      ctNetworkCpuZeta
     };
 
     enum NetworkRole
diff --git a/source/glest_game/game/stats.cpp b/source/glest_game/game/stats.cpp
index e4c9fa7d4..be28499b4 100644
--- a/source/glest_game/game/stats.cpp
+++ b/source/glest_game/game/stats.cpp
@@ -59,7 +59,7 @@ namespace Glest
               break;
               case ctCpuUltra:controlString = lang.getString ("CpuUltra");
               break;
-              case ctCpuMega:controlString = lang.getString ("CpuMega");
+              case ctCpuZeta:controlString = lang.getString ("CpuZeta");
               break;
               case ctNetwork:controlString = lang.getString ("Network");
               break;
@@ -74,8 +74,8 @@ namespace Glest
               case ctNetworkCpuUltra:controlString =
                 lang.getString ("NetworkCpuUltra");
               break;
-              case ctNetworkCpuMega:controlString =
-                lang.getString ("NetworkCpuMega");
+              case ctNetworkCpuZeta:controlString =
+                lang.getString ("NetworkCpuZeta");
               break;
 
               default:printf ("Error control = %d\n", control);
diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index 0c93d6081..d1539b82e 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -8035,7 +8035,7 @@ void Renderer::checkGlCaps() {
 
 		message += "Your system supports OpenGL version [";
  		message += getGlVersion() + string("]\n");
- 		message += "MegaGlest needs a version that supports\n";
+ 		message += "ZetaGlest needs a version that supports\n";
  		message += "glActiveTexture (OpenGL 1.3) or the ARB_multitexture extension.";
 
  		throw megaglest_runtime_error(message.c_str(),true);
@@ -8047,7 +8047,7 @@ void Renderer::checkGlCaps() {
 
 		message += "Your system supports OpenGL version [";
  		message += getGlVersion() + string("]\n");
- 		message += "MegaGlest needs at least version 2.1 to work\n";
+ 		message += "ZetaGlest needs at least version 2.1 to work\n";
  		message += "You may solve this problem by installing your latest video card drivers";
 
  		throw megaglest_runtime_error(message.c_str(),true);
@@ -8056,7 +8056,7 @@ void Renderer::checkGlCaps() {
 	//opengl 1.4 or extension
 	//if(!isGlVersionSupported(1, 4, 0)){
 	if(glewIsSupported("GL_VERSION_1_4") == false) {
-		checkExtension("GL_ARB_texture_env_crossbar", "MegaGlest");
+		checkExtension("GL_ARB_texture_env_crossbar", "ZetaGlest");
 	}
 }
 
diff --git a/source/glest_game/main/battle_end.cpp b/source/glest_game/main/battle_end.cpp
index 1d4b09ecd..94c8355cc 100644
--- a/source/glest_game/main/battle_end.cpp
+++ b/source/glest_game/main/battle_end.cpp
@@ -767,8 +767,8 @@ namespace Glest
             case ctCpuUltra:
               controlString = lang.getString ("CpuUltra");
               break;
-            case ctCpuMega:
-              controlString = lang.getString ("CpuMega");
+            case ctCpuZeta:
+              controlString = lang.getString ("CpuZeta");
               break;
             case ctNetwork:
               controlString = lang.getString ("Network");
@@ -786,8 +786,8 @@ namespace Glest
             case ctNetworkCpuUltra:
               controlString = lang.getString ("NetworkCpuUltra");
               break;
-            case ctNetworkCpuMega:
-              controlString = lang.getString ("NetworkCpuMega");
+            case ctNetworkCpuZeta:
+              controlString = lang.getString ("NetworkCpuZeta");
               break;
 
             default:
diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index 5cb9b2c1b..6f752ffba 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -1236,7 +1236,7 @@ namespace
         Config & config = Config::getInstance ();
         Metrics::reload (config.getInt ("ScreenWidth"),
                          config.getInt ("ScreenHeight"));
-//window->setText(config.getString("WindowTitle","MegaGlest"));
+//window->setText(config.getString("WindowTitle","ZetaGlest"));
 //this->mainMenu->init();
       }
 
diff --git a/source/glest_game/main/program.cpp b/source/glest_game/main/program.cpp
index 1b05a61ef..0cc689526 100644
--- a/source/glest_game/main/program.cpp
+++ b/source/glest_game/main/program.cpp
@@ -68,7 +68,7 @@ namespace Glest
 
     bool Program::wantShutdownApplicationAfterGame = false;
     const char *
-      ProgramState::MAIN_PROGRAM_RENDER_KEY = "MEGAGLEST.RENDER";
+      ProgramState::MAIN_PROGRAM_RENDER_KEY = "ZETAGLEST.RENDER";
 
 // =====================================================
 //      class Program::CrashProgramState
@@ -185,7 +185,7 @@ namespace Glest
       }
       else
       {
-        msgBox.setText ("Mega-Glest has crashed.");
+        msgBox.setText ("ZetaGlest has crashed.");
       }
 
       mouse2dAnim = mouseY = mouseX = 0;
@@ -1357,7 +1357,7 @@ namespace Glest
                                   __LINE__);
 
 //window
-//window->setText("MegaGlest");
+//window->setText("ZetaGlest");
       window->setStyle (config.getBool ("Windowed") ? wsWindowedFixed :
                         wsFullscreen);
       window->setPos (0, 0);
@@ -1678,7 +1678,7 @@ namespace Glest
 //                                     config.getBool("HardwareAcceleration","false"),
 //                                     config.getBool("FullScreenAntiAliasing","false"),
 //                                     config.getFloat("GammaValue","0.0"));
-//              window->setText(config.getString("WindowTitle","MegaGlest"));
+//              window->setText(config.getString("WindowTitle","ZetaGlest"));
 //              initResolution();
 //      }
 //}
diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index b8d45fdc7..6d35720d5 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -567,7 +567,7 @@ namespace Glest
       controlItems.push_back (lang.getString ("CpuEasy"));
       controlItems.push_back (lang.getString ("Cpu"));
       controlItems.push_back (lang.getString ("CpuUltra"));
-      controlItems.push_back (lang.getString ("CpuMega"));
+      controlItems.push_back (lang.getString ("CpuZeta"));
       controlItems.push_back (lang.getString ("Network"));
       controlItems.push_back (lang.getString ("NetworkUnassigned"));
       controlItems.push_back (lang.getString ("Human"));
@@ -578,7 +578,7 @@ namespace Glest
         controlItems.push_back (lang.getString ("NetworkCpuEasy"));
         controlItems.push_back (lang.getString ("NetworkCpu"));
         controlItems.push_back (lang.getString ("NetworkCpuUltra"));
-        controlItems.push_back (lang.getString ("NetworkCpuMega"));
+        controlItems.push_back (lang.getString ("NetworkCpuZeta"));
       }
 
       for (int i = 1; i <= GameConstants::maxPlayers; ++i)
@@ -1026,7 +1026,7 @@ namespace Glest
       controlItems.push_back (lang.getString ("CpuEasy"));
       controlItems.push_back (lang.getString ("Cpu"));
       controlItems.push_back (lang.getString ("CpuUltra"));
-      controlItems.push_back (lang.getString ("CpuMega"));
+      controlItems.push_back (lang.getString ("CpuZeta"));
       controlItems.push_back (lang.getString ("Network"));
       controlItems.push_back (lang.getString ("NetworkUnassigned"));
       controlItems.push_back (lang.getString ("Human"));
@@ -1036,7 +1036,7 @@ namespace Glest
         controlItems.push_back (lang.getString ("NetworkCpuEasy"));
         controlItems.push_back (lang.getString ("NetworkCpu"));
         controlItems.push_back (lang.getString ("NetworkCpuUltra"));
-        controlItems.push_back (lang.getString ("NetworkCpuMega"));
+        controlItems.push_back (lang.getString ("NetworkCpuZeta"));
       }
 
       for (int i = 0; i < GameConstants::maxPlayers; ++i)
@@ -2693,7 +2693,7 @@ namespace Glest
                                                     ultraMultiplier, 1));
         listBoxRMultiplier[index].setEnabled (true);
       }
-      else if (ct == ctCpuMega || ct == ctNetworkCpuMega)
+      else if (ct == ctCpuZeta || ct == ctNetworkCpuZeta)
       {
         listBoxRMultiplier[index].setSelectedItem (floatToStr
                                                    (GameConstants::
@@ -2979,7 +2979,7 @@ namespace Glest
                       || listBoxControls[i].getSelectedItemIndex () ==
                       ctCpuUltra
                       || listBoxControls[i].getSelectedItemIndex () ==
-                      ctCpuMega))
+                      ctCpuZeta))
               {
                 if (SystemFlags::VERBOSE_MODE_ENABLED)
                   printf ("In [%s::%s Line %d]\n",
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 244c6e7d7..7cbfc2295 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -782,7 +782,7 @@ namespace Glest
         controlItems.push_back (lang.getString ("CpuEasy"));
         controlItems.push_back (lang.getString ("Cpu"));
         controlItems.push_back (lang.getString ("CpuUltra"));
-        controlItems.push_back (lang.getString ("CpuMega"));
+        controlItems.push_back (lang.getString ("CpuZeta"));
         controlItems.push_back (lang.getString ("Network"));
         controlItems.push_back (lang.getString ("NetworkUnassigned"));
         controlItems.push_back (lang.getString ("Human"));
@@ -792,7 +792,7 @@ namespace Glest
           controlItems.push_back (lang.getString ("NetworkCpuEasy"));
           controlItems.push_back (lang.getString ("NetworkCpu"));
           controlItems.push_back (lang.getString ("NetworkCpuUltra"));
-          controlItems.push_back (lang.getString ("NetworkCpuMega"));
+          controlItems.push_back (lang.getString ("NetworkCpuZeta"));
         }
 
         vector < string > teamItems;
@@ -1164,7 +1164,7 @@ namespace Glest
       controlItems.push_back (lang.getString ("CpuEasy"));
       controlItems.push_back (lang.getString ("Cpu"));
       controlItems.push_back (lang.getString ("CpuUltra"));
-      controlItems.push_back (lang.getString ("CpuMega"));
+      controlItems.push_back (lang.getString ("CpuZeta"));
       controlItems.push_back (lang.getString ("Network"));
       controlItems.push_back (lang.getString ("NetworkUnassigned"));
       controlItems.push_back (lang.getString ("Human"));
@@ -1174,7 +1174,7 @@ namespace Glest
         controlItems.push_back (lang.getString ("NetworkCpuEasy"));
         controlItems.push_back (lang.getString ("NetworkCpu"));
         controlItems.push_back (lang.getString ("NetworkCpuUltra"));
-        controlItems.push_back (lang.getString ("NetworkCpuMega"));
+        controlItems.push_back (lang.getString ("NetworkCpuZeta"));
       }
 
       for (int i = 0; i < GameConstants::maxPlayers; ++i)
@@ -2412,7 +2412,7 @@ namespace Glest
                         || listBoxControls[i].getSelectedItemIndex () ==
                         ctCpuUltra
                         || listBoxControls[i].getSelectedItemIndex () ==
-                        ctCpuMega))
+                        ctCpuZeta))
                 {
                   listBoxFactions[i].setSelectedItemIndex (0);
                 }
@@ -4792,7 +4792,7 @@ namespace Glest
                  || listBoxControls[i].getSelectedItemIndex () ==
                  ctCpuUltra
                  || listBoxControls[i].getSelectedItemIndex () ==
-                 ctCpuMega) && checkBoxScenario.getValue () == true)
+                 ctCpuZeta) && checkBoxScenario.getValue () == true)
             {
 
             }
@@ -6546,7 +6546,7 @@ namespace Glest
                         || listBoxControls[i].getSelectedItemIndex () ==
                         ctCpuUltra
                         || listBoxControls[i].getSelectedItemIndex () ==
-                        ctCpuMega))
+                        ctCpuZeta))
                 {
                   listBoxFactions[i].setSelectedItemIndex (0);
                 }
@@ -6571,7 +6571,7 @@ namespace Glest
                            || listBoxControls[i].getSelectedItemIndex () ==
                            ctCpuUltra
                            || listBoxControls[i].getSelectedItemIndex () ==
-                           ctCpuMega)
+                           ctCpuZeta)
                   {
                     lastSelectedTeamIndex[i] =
                       listBoxTeams[i].getSelectedItemIndex ();
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 0b1841324..902d790fb 100644
--- a/source/glest_game/menu/menu_state_custom_game_update.cpp
+++ b/source/glest_game/menu/menu_state_custom_game_update.cpp
@@ -1060,7 +1060,7 @@ namespace Glest
                     || listBoxControls[i].getSelectedItemIndex () ==
                     ctCpuUltra
                     || listBoxControls[i].getSelectedItemIndex () ==
-                    ctCpuMega)
+                    ctCpuZeta)
                 {
                   setSlotHuman (i);
 
@@ -1268,7 +1268,7 @@ namespace Glest
         listBoxRMultiplier[index].setEnabled (checkBoxScenario.getValue () ==
                                               false);
       }
-      else if (ct == ctCpuMega || ct == ctNetworkCpuMega)
+      else if (ct == ctCpuZeta || ct == ctNetworkCpuZeta)
       {
         listBoxRMultiplier[index].setSelectedItem (floatToStr
                                                    (GameConstants::
diff --git a/source/glest_game/menu/menu_state_load_game.cpp b/source/glest_game/menu/menu_state_load_game.cpp
index ae8e96ea4..0ade8ab8b 100644
--- a/source/glest_game/menu/menu_state_load_game.cpp
+++ b/source/glest_game/menu/menu_state_load_game.cpp
@@ -422,9 +422,9 @@ namespace Glest
 
                   const XmlNode *rootNode = xmlTree.getRootNode ();
                   if (rootNode != NULL
-                      && rootNode->hasChild ("megaglest-saved-game") == true)
+                      && rootNode->hasChild ("zetaglest-saved-game") == true)
                   {
-                    rootNode = rootNode->getChild ("megaglest-saved-game");
+                    rootNode = rootNode->getChild ("zetaglest-saved-game");
                   }
 
                   if (rootNode == NULL)
diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp
index b19f3ef80..059ce3a03 100644
--- a/source/glest_game/menu/menu_state_masterserver.cpp
+++ b/source/glest_game/menu/menu_state_masterserver.cpp
@@ -1381,7 +1381,7 @@ namespace Glest
           {
             string announcementURL =
               Config::getInstance ().getString ("AnnouncementURL",
-                                                "http://master.megaglest.org/files/announcement.txt");
+                                                "http://zetaglest.dreamhosters.com/files/announcement.txt");
             if (announcementURL != "")
             {
 
@@ -1430,7 +1430,7 @@ namespace Glest
               addLine ("---------------------------------------------");
             string versionURL =
               Config::getInstance ().getString ("VersionURL",
-                                                "http://master.megaglest.org/files/versions/")
+                                                "http://zetaglest.dreamhosters.com/files/versions/")
               + glestVersionString + ".txt";
             //printf("\nversionURL=%s\n",versionURL.c_str());
             if (versionURL != "")
diff --git a/source/glest_game/menu/menu_state_options_graphics.cpp b/source/glest_game/menu/menu_state_options_graphics.cpp
index 33b530ce7..b43f80301 100644
--- a/source/glest_game/menu/menu_state_options_graphics.cpp
+++ b/source/glest_game/menu/menu_state_options_graphics.cpp
@@ -640,7 +640,7 @@ namespace
                                config.getFloat ("GammaValue", "0.0"));
       Metrics::reload (this->program->getWindow ()->getScreenWidth (),
                        this->program->getWindow ()->getScreenHeight ());
-      window->setText (config.getString ("WindowTitle", "MegaGlest"));
+      window->setText (config.getString ("WindowTitle", "ZetaGlest"));
 
       this->mainMenu->init ();
     }
diff --git a/source/glest_game/menu/menu_state_root.cpp b/source/glest_game/menu/menu_state_root.cpp
index a7c2f2128..12e6b3b58 100644
--- a/source/glest_game/menu/menu_state_root.cpp
+++ b/source/glest_game/menu/menu_state_root.cpp
@@ -986,7 +986,7 @@ namespace Glest
             {
               char szMsg[8096] = "";
               snprintf (szMsg, 8096,
-                        "A new update was detected: %s\nUpdate Date: %s\nPlease visit megaglest.org for details!",
+                        "A new update was detected: %s\nUpdate Date: %s\nPlease visit zetaglest.github.io for details!",
                         props.getString ("LatestGameVersion", "?").c_str (),
                         props.getString ("LatestGameVersionReleaseDate",
                                          "?").c_str ());
diff --git a/source/glest_game/type_instances/faction.cpp b/source/glest_game/type_instances/faction.cpp
index b2212c9d8..94bf01c23 100644
--- a/source/glest_game/type_instances/faction.cpp
+++ b/source/glest_game/type_instances/faction.cpp
@@ -919,7 +919,7 @@ namespace Glest
     {
       bool result = true;
       if (control == ctCpuEasy || control == ctCpu ||
-          control == ctCpuUltra || control == ctCpuMega)
+          control == ctCpuUltra || control == ctCpuZeta)
       {
         //printf("AI player for faction index: %d (%s) current pathfinding: %d\n",index,factionType->getName().c_str(),getUnitPathfindingListCount());
 
@@ -1182,7 +1182,7 @@ namespace Glest
       if (enableServerControlledAI == false || isNetworkGame == false)
       {
         result = (control == ctCpuEasy || control == ctCpu
-                  || control == ctCpuUltra || control == ctCpuMega);
+                  || control == ctCpuUltra || control == ctCpuZeta);
       }
       else
       {
@@ -1191,13 +1191,13 @@ namespace Glest
           if (role == nrServer)
           {
             result = (control == ctCpuEasy || control == ctCpu
-                      || control == ctCpuUltra || control == ctCpuMega);
+                      || control == ctCpuUltra || control == ctCpuZeta);
           }
           else
           {
             result = (control == ctNetworkCpuEasy || control == ctNetworkCpu
                       || control == ctNetworkCpuUltra
-                      || control == ctNetworkCpuMega);
+                      || control == ctNetworkCpuZeta);
           }
         }
       }
@@ -1208,9 +1208,9 @@ namespace Glest
     bool Faction::getCpuControl () const
     {
       return control == ctCpuEasy || control == ctCpu || control == ctCpuUltra
-        || control == ctCpuMega || control == ctNetworkCpuEasy
+        || control == ctCpuZeta || control == ctNetworkCpuEasy
         || control == ctNetworkCpu || control == ctNetworkCpuUltra
-        || control == ctNetworkCpuMega;
+        || control == ctNetworkCpuZeta;
     }
 
 // ==================== upgrade manager ====================
diff --git a/source/glest_game/type_instances/faction.h b/source/glest_game/type_instances/faction.h
index ddc8453ab..46b29f0a1 100644
--- a/source/glest_game/type_instances/faction.h
+++ b/source/glest_game/type_instances/faction.h
@@ -373,9 +373,9 @@ namespace Glest
       {
         return control == ctCpuUltra;
       }
-      inline bool getCpuMegaControl () const
+      inline bool getCpuZetaControl () const
       {
-        return control == ctCpuMega;
+        return control == ctCpuZeta;
       }
       inline ControlType getControlType () const
       {
diff --git a/source/glest_game/types/faction_type.h b/source/glest_game/types/faction_type.h
index d3ddad79a..8696a9de2 100644
--- a/source/glest_game/types/faction_type.h
+++ b/source/glest_game/types/faction_type.h
@@ -50,7 +50,7 @@ namespace Glest
       aibsvcMaxBuildRadius,
       aibsvcMinMinWarriors,
       aibsvcMinMinWarriorsExpandCpuEasy,
-      aibsvcMinMinWarriorsExpandCpuMega,
+      aibsvcMinMinWarriorsExpandCpuZeta,
       aibsvcMinMinWarriorsExpandCpuUltra,
       aibsvcMinMinWarriorsExpandCpuNormal,
       aibsvcMaxMinWarriors,
@@ -68,8 +68,10 @@ namespace Glest
       enumMap["MinMinWarriors"] = aibsvcMinMinWarriors;
       enumMap["MinMinWarriorsExpandCpuEasy"] =
         aibsvcMinMinWarriorsExpandCpuEasy;
-      enumMap["MinMinWarriorsExpandCpuMega"] =
-        aibsvcMinMinWarriorsExpandCpuMega;
+	  enumMap["MinMinWarriorsExpandCpuMega"] =
+		  aibsvcMinMinWarriorsExpandCpuZeta;
+      enumMap["MinMinWarriorsExpandCpuZeta"] =
+        aibsvcMinMinWarriorsExpandCpuZeta;
       enumMap["MinMinWarriorsExpandCpuUltra"] =
         aibsvcMinMinWarriorsExpandCpuUltra;
       enumMap["MinMinWarriorsExpandCpuNormal"] =
diff --git a/source/glest_game/world/scenario.cpp b/source/glest_game/world/scenario.cpp
index 794133743..9275a2129 100644
--- a/source/glest_game/world/scenario.cpp
+++ b/source/glest_game/world/scenario.cpp
@@ -343,7 +343,7 @@ Please contact the ZetaGlest team for more info.";
             if (factionControl == ctCpuUltra) {
               scenarioInfo->resourceMultipliers[i] =
                   GameConstants::ultraMultiplier;
-            } else if (factionControl == ctCpuMega) {
+            } else if (factionControl == ctCpuZeta) {
               scenarioInfo->resourceMultipliers[i] =
                   GameConstants::megaMultiplier;
             }
@@ -548,8 +548,8 @@ Please contact the ZetaGlest team for more info.";
         return ctCpu;
       } else if (str == "cpu-ultra") {
         return ctCpuUltra;
-      } else if (str == "cpu-mega") {
-        return ctCpuMega;
+      } else if (str == "cpu-mega" || str == "cpu-zeta") {
+        return ctCpuZeta;
       } else if (str == "human") {
         return ctHuman;
       } else if (str == "network") {
@@ -558,7 +558,7 @@ Please contact the ZetaGlest team for more info.";
 
       char szBuf[8096] = "";
       snprintf(szBuf, 8096,
-               "Invalid controller value specified in scenario: [%s] must be one of the following: closed, cpu-easy, cpu, cpu-ultra, cpu-mega, human",
+               "Invalid controller value specified in scenario: [%s] must be one of the following: closed, cpu-easy, cpu, cpu-ultra, cpu-zeta, human",
                str.c_str());
       throw std::runtime_error(szBuf);
     }
@@ -577,8 +577,8 @@ Please contact the ZetaGlest team for more info.";
       case ctCpuUltra:
         controlString = lang.getString("CpuUltra");
         break;
-      case ctCpuMega:
-        controlString = lang.getString("CpuMega");
+      case ctCpuZeta:
+        controlString = lang.getString("CpuZeta");
         break;
       case ctNetwork:
         controlString = lang.getString("Network");
@@ -596,8 +596,8 @@ Please contact the ZetaGlest team for more info.";
       case ctNetworkCpuUltra:
         controlString = lang.getString("NetworkCpuUltra");
         break;
-      case ctNetworkCpuMega:
-        controlString = lang.getString("NetworkCpuMega");
+      case ctNetworkCpuZeta:
+        controlString = lang.getString("NetworkCpuZeta");
         break;
 
       default:
diff --git a/source/glest_game/world/unit_updater.cpp b/source/glest_game/world/unit_updater.cpp
index 942fd0e01..df4cd2805 100644
--- a/source/glest_game/world/unit_updater.cpp
+++ b/source/glest_game/world/unit_updater.cpp
@@ -3001,7 +3001,7 @@ bool UnitUpdater::unitOnRange(Unit *unit, int range, Unit **rangedPtr,
 	Unit* attackingEnemySeen= NULL;
 	ControlType controlType= unit->getFaction()->getControlType();
 	bool isUltra= controlType == ctCpuUltra || controlType == ctNetworkCpuUltra;
-	bool isMega= controlType == ctCpuMega || controlType == ctNetworkCpuMega;
+	bool isZeta = controlType == ctCpuZeta || controlType == ctNetworkCpuZeta;
 
 
 	string randomInfoData = "enemies.size() = " + intToStr(enemies.size());
@@ -3037,7 +3037,7 @@ bool UnitUpdater::unitOnRange(Unit *unit, int range, Unit **rangedPtr,
 					result		= true;
     			}
 
-    			if(isUltra || isMega) {
+    			if(isUltra || isZeta) {
 
         			if(distToStandingUnit < 0 || currentDist< distToStandingUnit) {
         			    if(enemies[i]->getCurrSkill()!=NULL && enemies[i]->getCurrSkill()->getClass()==scAttack) {
@@ -3050,7 +3050,7 @@ bool UnitUpdater::unitOnRange(Unit *unit, int range, Unit **rangedPtr,
     	}
     }
 
-    if(evalMode == false && (isUltra || isMega)) {
+    if(evalMode == false && (isUltra || isZeta)) {
 
     	unit->getRandom()->addLastCaller(randomInfoData);
 
diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp
index 0500afa5b..3f88c5fa5 100644
--- a/source/glest_map_editor/main.cpp
+++ b/source/glest_map_editor/main.cpp
@@ -799,7 +799,7 @@ void MainWindow::onMenuFileSaveAs(wxCommandEvent &event) {
 		fd.SetDirectory(ToUnicode(defaultPath));
 	}
 
-	fd.SetWildcard(wxT("MegaGlest Map (*.mgm)|*.mgm|Glest Map (*.gbm)|*.gbm"));
+	fd.SetWildcard(wxT("ZetaGlest Map (*.mgm)|*.mgm|Glest Map (*.gbm)|*.gbm"));
 	if (fd.ShowModal() == wxID_OK) {
 #ifdef WIN32
 		const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(fd.GetPath()));
@@ -1198,7 +1198,7 @@ void MainWindow::onMenuHideWater(wxCommandEvent &event) {
 void MainWindow::onMenuViewAbout(wxCommandEvent &event) {
 	MsgDialog(
 		this,
-		wxT("\n    Glest Map Editor\n    Copyright 2004-2010 The Glest Team\n    Copyright 2010-2018 The MegaGlest Team    \n"),
+		wxT("\n    ZetaGlest Map Editor\n    Copyright 2004-2010 The Glest Team\n    Copyright 2010-2018 The MegaGlest Team    \n"),
 		wxT("About")).ShowModal();
 }
 
@@ -1657,7 +1657,7 @@ bool App::OnInit() {
 		if(argv[1][0]=='-') {   // any flag gives help and exits program.
 			std::cout << std::endl << "ZetaGlest map editor " << mapeditorVersionString << " [Using " << (const char *)wxConvCurrent->cWX2MB(wxVERSION_STRING) << "]" << std::endl << std::endl;
 			//std::cout << "\nglest_map_editor [MGM FILE]" << std::endl << std::endl;
-			std::cout << "Creates or edits megaglest/glest maps. [.mgm/.gbm]" << std::endl << std::endl;
+			std::cout << "Creates or edits zetaglest/glest maps. [.mgm/.gbm]" << std::endl << std::endl;
 			std::cout << "Draw with left mouse button."  << std::endl;
 			std::cout << "Move map with right mouse button."  << std::endl;
 			std::cout << "Zoom with middle mouse button or mousewheel."  << std::endl;
diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
index 03c671959..744251165 100644
--- a/source/shared_lib/sources/platform/posix/ircclient.cpp
+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
@@ -1046,7 +1046,7 @@ void IRCThread::connectToHost() {
 	if(connectRequired == false) {
 #if !defined(DISABLE_IRCCLIENT)
 		MutexSafeWrapper safeMutex1(&mutexIRCSession,string(__FILE__) + "_" + intToStr(__LINE__));
-        if(irc_connect(ircSession, argv[0].c_str(), IRC_SERVER_PORT, 0, this->nick.c_str(), this->username.c_str(), "megaglest")) {
+        if(irc_connect(ircSession, argv[0].c_str(), IRC_SERVER_PORT, 0, this->nick.c_str(), this->username.c_str(), "zetaglest")) {
         	safeMutex1.ReleaseLock();
 
             if(SystemFlags::VERBOSE_MODE_ENABLED || IRCThread::debugEnabled) printf ("===> IRC Could not connect: %s\n", irc_strerror (irc_errno(ircSession)));
diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
index 8bc2922f3..a1826170d 100644
--- a/source/shared_lib/sources/platform/posix/socket.cpp
+++ b/source/shared_lib/sources/platform/posix/socket.cpp
@@ -2853,12 +2853,12 @@ bool UPNP_Tools::upnp_add_redirect(int ports[2],bool mutexLock) {
 		//int r                   = 0;
 #ifndef MINIUPNPC_VERSION_PRE1_5
 	#ifndef MINIUPNPC_VERSION_PRE1_6
-		int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,ext_port_str, int_port_str, lanaddr, "MegaGlest - www.megaglest.org", "TCP", 0, NULL);
+		int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,ext_port_str, int_port_str, lanaddr, "ZetaGlest - zetaglest.github.io", "TCP", 0, NULL);
 	#else
-		int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,ext_port_str, int_port_str, lanaddr, "MegaGlest - www.megaglest.org", "TCP", 0);
+		int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,ext_port_str, int_port_str, lanaddr, "ZetaGlest - zetaglest.github.io", "TCP", 0);
 	#endif
 #else
-		int r = UPNP_AddPortMapping(urls.controlURL, data.servicetype,ext_port_str, int_port_str, lanaddr, "MegaGlest - www.megaglest.org", "TCP", 0);
+		int r = UPNP_AddPortMapping(urls.controlURL, data.servicetype,ext_port_str, int_port_str, lanaddr, "ZetaGlest - zetaglest.github.io", "TCP", 0);
 #endif
 		if (r != UPNPCOMMAND_SUCCESS) {
 			if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] AddPortMapping(%s, %s, %s) failed\n",__FILE__,__FUNCTION__,__LINE__,ext_port_str, int_port_str, lanaddr);
diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
index 663cbd940..1674c80ca 100644
--- a/source/shared_lib/sources/util/util.cpp
+++ b/source/shared_lib/sources/util/util.cpp
@@ -134,7 +134,7 @@ std::string SystemFlags::getHTTP(std::string URL,CURL *handle,int timeOut,CURLco
 
 	/* some servers don't like requests that are made without a user-agent
 	   field, so we provide one */
-	curl_easy_setopt(handle, CURLOPT_USERAGENT, "megaglest-agent/1.0");
+	curl_easy_setopt(handle, CURLOPT_USERAGENT, "zetaglest-agent/1.0");
 
 	/* follow HTTP redirects (status 3xx), 20 at most */
 	curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1);
@@ -569,7 +569,7 @@ void SystemFlags::logDebugEntry(DebugType type, string debugEntry, time_t debugT
             if(currentDebugLog.fileStream->is_open() == true) {
 				MutexSafeWrapper safeMutex(currentDebugLog.mutex,string(extractFileFromDirectoryPath(__FILE__).c_str()) + "_" + intToStr(__LINE__));
 
-				(*currentDebugLog.fileStream) << "Starting Mega-Glest logging for type: " << type << "\n";
+				(*currentDebugLog.fileStream) << "Starting ZetaGlest logging for type: " << type << "\n";
 				(*currentDebugLog.fileStream).flush();
 
 				safeMutex.ReleaseLock();