Index: code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc	(revision 7233)
+++ code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc	(revision 7236)
@@ -55,10 +55,10 @@
     static const std::string __CC_setMainMenuSoundPath_name = "setMMSoundPath";
 
-    _SetConsoleCommand(__CC_startStandalone_name,      &GSMainMenu::startStandalone).deactivate();
-    _SetConsoleCommand(__CC_startServer_name,          &GSMainMenu::startServer    ).deactivate();
-    _SetConsoleCommand(__CC_startClient_name,          &GSMainMenu::startClient    ).deactivate();
-    _SetConsoleCommand(__CC_startDedicated_name,       &GSMainMenu::startDedicated ).deactivate();
-    _SetConsoleCommand(__CC_startMainMenu_name,        &GSMainMenu::startMainMenu  ).deactivate();
-    _SetConsoleCommand(__CC_setMainMenuSoundPath_name, &GSMainMenu::setMainMenuSoundPath).hide();
+    SetConsoleCommand(__CC_startStandalone_name,      &GSMainMenu::startStandalone).deactivate();
+    SetConsoleCommand(__CC_startServer_name,          &GSMainMenu::startServer    ).deactivate();
+    SetConsoleCommand(__CC_startClient_name,          &GSMainMenu::startClient    ).deactivate();
+    SetConsoleCommand(__CC_startDedicated_name,       &GSMainMenu::startDedicated ).deactivate();
+    SetConsoleCommand(__CC_startMainMenu_name,        &GSMainMenu::startMainMenu  ).deactivate();
+    SetConsoleCommand(__CC_setMainMenuSoundPath_name, &GSMainMenu::setMainMenuSoundPath).hide();
 
     GSMainMenu::GSMainMenu(const GameStateInfo& info)
@@ -103,10 +103,10 @@
         InputManager::getInstance().enterState("MainMenuHackery");
 
-        _ModifyConsoleCommand(__CC_startStandalone_name).activate();
-        _ModifyConsoleCommand(__CC_startServer_name    ).activate();
-        _ModifyConsoleCommand(__CC_startClient_name    ).activate();
-        _ModifyConsoleCommand(__CC_startDedicated_name ).activate();
-        _ModifyConsoleCommand(__CC_startMainMenu_name  ).activate();
-        _ModifyConsoleCommand(__CC_setMainMenuSoundPath_name).setObject(this);
+        ModifyConsoleCommand(__CC_startStandalone_name).activate();
+        ModifyConsoleCommand(__CC_startServer_name    ).activate();
+        ModifyConsoleCommand(__CC_startClient_name    ).activate();
+        ModifyConsoleCommand(__CC_startDedicated_name ).activate();
+        ModifyConsoleCommand(__CC_startMainMenu_name  ).activate();
+        ModifyConsoleCommand(__CC_setMainMenuSoundPath_name).setObject(this);
 
         KeyBinderManager::getInstance().setToDefault();
@@ -135,10 +135,10 @@
         GraphicsManager::getInstance().setCamera(0);
 
-        _ModifyConsoleCommand(__CC_startStandalone_name).deactivate();
-        _ModifyConsoleCommand(__CC_startServer_name    ).deactivate();
-        _ModifyConsoleCommand(__CC_startClient_name    ).deactivate();
-        _ModifyConsoleCommand(__CC_startDedicated_name ).deactivate();
-        _ModifyConsoleCommand(__CC_startMainMenu_name  ).deactivate();
-        _ModifyConsoleCommand(__CC_setMainMenuSoundPath_name).setObject(0);
+        ModifyConsoleCommand(__CC_startStandalone_name).deactivate();
+        ModifyConsoleCommand(__CC_startServer_name    ).deactivate();
+        ModifyConsoleCommand(__CC_startClient_name    ).deactivate();
+        ModifyConsoleCommand(__CC_startDedicated_name ).deactivate();
+        ModifyConsoleCommand(__CC_startMainMenu_name  ).deactivate();
+        ModifyConsoleCommand(__CC_setMainMenuSoundPath_name).setObject(0);
     }
 
Index: code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc	(revision 7233)
+++ code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc	(revision 7236)
@@ -45,7 +45,7 @@
     static const std::string __CC_pause_name = "pause";
 
-    _SetConsoleCommand("printObjects", &GSRoot::printObjects).hide();
-    _SetConsoleCommand(__CC_setTimeFactor_name, &GSRoot::setTimeFactor).accessLevel(AccessLevel::Master).defaultValues(1.0);
-    _SetConsoleCommand(__CC_pause_name,         &GSRoot::pause        ).accessLevel(AccessLevel::Master);
+    SetConsoleCommand("printObjects", &GSRoot::printObjects).hide();
+    SetConsoleCommand(__CC_setTimeFactor_name, &GSRoot::setTimeFactor).accessLevel(AccessLevel::Master).defaultValues(1.0);
+    SetConsoleCommand(__CC_pause_name,         &GSRoot::pause        ).accessLevel(AccessLevel::Master);
 
     registerStaticNetworkFunction(&TimeFactorListener::setTimeFactor);
@@ -82,12 +82,12 @@
         TimeFactorListener::setTimeFactor(1.0f);
 
-        _ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(this);
-        _ModifyConsoleCommand(__CC_pause_name).setObject(this);
+        ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(this);
+        ModifyConsoleCommand(__CC_pause_name).setObject(this);
     }
 
     void GSRoot::deactivate()
     {
-        _ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(0);
-        _ModifyConsoleCommand(__CC_pause_name).setObject(0);
+        ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(0);
+        ModifyConsoleCommand(__CC_pause_name).setObject(0);
     }
 
