Index: code/branches/consolecommands3/src/orxonox/ChatInputHandler.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/ChatInputHandler.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/ChatInputHandler.cc	(revision 7219)
@@ -46,8 +46,6 @@
 
   /* add commands to console */
-  SetConsoleCommandAlias( ChatInputHandler, activate_static, "startchat",
-    true );
-  SetConsoleCommandAlias( ChatInputHandler, activate_small_static,
-    "startchat_small", true );
+  _SetConsoleCommand( "startchat", &ChatInputHandler::activate_static );
+  _SetConsoleCommand( "startchat_small", &ChatInputHandler::activate_small_static );
 
   /* constructor */
Index: code/branches/consolecommands3/src/orxonox/Test.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/Test.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/Test.cc	(revision 7219)
@@ -38,10 +38,10 @@
     CreateFactory ( Test );
 
-    SetConsoleCommand(Test, printV1, true).accessLevel(AccessLevel::User);
-    SetConsoleCommand(Test, printV2, true).accessLevel(AccessLevel::User);
-    SetConsoleCommand(Test, printV3, true).accessLevel(AccessLevel::User);
-    SetConsoleCommand(Test, printV4, true).accessLevel(AccessLevel::User);
-    SetConsoleCommand(Test, call, true).accessLevel(AccessLevel::User);
-    SetConsoleCommand(Test, call2, true).accessLevel(AccessLevel::User);
+    _SetConsoleCommand("Test", "printV1", &Test::printV1).addShortcut();
+    _SetConsoleCommand("Test", "printV2", &Test::printV2).addShortcut();
+    _SetConsoleCommand("Test", "printV3", &Test::printV3).addShortcut();
+    _SetConsoleCommand("Test", "printV4", &Test::printV4).addShortcut();
+    _SetConsoleCommand("Test", "call",    &Test::call).addShortcut();
+    _SetConsoleCommand("Test", "call2",   &Test::call2).addShortcut();
 
 
Index: code/branches/consolecommands3/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/controllers/ArtificialController.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/controllers/ArtificialController.cc	(revision 7219)
@@ -47,9 +47,9 @@
 namespace orxonox
 {
-    SetConsoleCommand(ArtificialController, formationflight, true);
-    SetConsoleCommand(ArtificialController, masteraction, true);
-    SetConsoleCommand(ArtificialController, followme, true);
-    SetConsoleCommand(ArtificialController, passivebehaviour, true);
-    SetConsoleCommand(ArtificialController, formationsize, true);
+    _SetConsoleCommand("ArtificialController", "formationflight",  &ArtificialController::formationflight);
+    _SetConsoleCommand("ArtificialController", "masteraction",     &ArtificialController::masteraction);
+    _SetConsoleCommand("ArtificialController", "followme",         &ArtificialController::followme);
+    _SetConsoleCommand("ArtificialController", "passivebehaviour", &ArtificialController::passivebehaviour);
+    _SetConsoleCommand("ArtificialController", "formationsize",    &ArtificialController::formationsize);
 
     static const unsigned int STANDARD_MAX_FORMATION_SIZE = 7;
Index: code/branches/consolecommands3/src/orxonox/controllers/HumanController.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/controllers/HumanController.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/controllers/HumanController.cc	(revision 7219)
@@ -40,24 +40,24 @@
 namespace orxonox
 {
-    SetConsoleCommand(HumanController, moveFrontBack, true).setAsInputCommand();
-    SetConsoleCommand(HumanController, moveRightLeft, true).setAsInputCommand();
-    SetConsoleCommand(HumanController, moveUpDown,    true).setAsInputCommand();
-    SetConsoleCommand(HumanController, rotateYaw,     true).setAsInputCommand();
-    SetConsoleCommand(HumanController, rotatePitch,   true).setAsInputCommand();
-    SetConsoleCommand(HumanController, rotateRoll,    true).setAsInputCommand();
-    SetConsoleCommand(HumanController, fire,          true).keybindMode(KeybindMode::OnHold);
-    SetConsoleCommand(HumanController, reload,        true);
-    SetConsoleCommand(HumanController, boost,         true).keybindMode(KeybindMode::OnHold);
-    SetConsoleCommand(HumanController, greet,         true);
-    SetConsoleCommand(HumanController, switchCamera,  true);
-    SetConsoleCommand(HumanController, mouseLook,     true);
-    SetConsoleCommand(HumanController, suicide,       true);
-    SetConsoleCommand(HumanController, toggleGodMode, true);
-    SetConsoleCommand(HumanController, addBots,       true).defaultValues(1);
-    SetConsoleCommand(HumanController, killBots,      true).defaultValues(0);
-    SetConsoleCommand(HumanController, dropItems,     true);
-    SetConsoleCommand(HumanController, useItem,       true);
-    SetConsoleCommand(HumanController, cycleNavigationFocus,   true);
-    SetConsoleCommand(HumanController, releaseNavigationFocus, true);
+    _SetConsoleCommand("HumanController", "moveFrontBack",          &HumanController::moveFrontBack ).addShortcut().setAsInputCommand();
+    _SetConsoleCommand("HumanController", "moveRightLeft",          &HumanController::moveRightLeft ).addShortcut().setAsInputCommand();
+    _SetConsoleCommand("HumanController", "moveUpDown",             &HumanController::moveUpDown    ).addShortcut().setAsInputCommand();
+    _SetConsoleCommand("HumanController", "rotateYaw",              &HumanController::rotateYaw     ).addShortcut().setAsInputCommand();
+    _SetConsoleCommand("HumanController", "rotatePitch",            &HumanController::rotatePitch   ).addShortcut().setAsInputCommand();
+    _SetConsoleCommand("HumanController", "rotateRoll",             &HumanController::rotateRoll    ).addShortcut().setAsInputCommand();
+    _SetConsoleCommand("HumanController", "fire",                   &HumanController::fire          ).addShortcut().keybindMode(KeybindMode::OnHold);
+    _SetConsoleCommand("HumanController", "reload",                 &HumanController::reload        ).addShortcut();
+    _SetConsoleCommand("HumanController", "boost",                  &HumanController::boost         ).addShortcut().keybindMode(KeybindMode::OnHold);
+    _SetConsoleCommand("HumanController", "greet",                  &HumanController::greet         ).addShortcut();
+    _SetConsoleCommand("HumanController", "switchCamera",           &HumanController::switchCamera  ).addShortcut();
+    _SetConsoleCommand("HumanController", "mouseLook",              &HumanController::mouseLook     ).addShortcut();
+    _SetConsoleCommand("HumanController", "suicide",                &HumanController::suicide       ).addShortcut();
+    _SetConsoleCommand("HumanController", "toggleGodMode",          &HumanController::toggleGodMode ).addShortcut();
+    _SetConsoleCommand("HumanController", "addBots",                &HumanController::addBots       ).addShortcut().defaultValues(1);
+    _SetConsoleCommand("HumanController", "killBots",               &HumanController::killBots      ).addShortcut().defaultValues(0);
+    _SetConsoleCommand("HumanController", "dropItems",              &HumanController::dropItems     ).addShortcut();
+    _SetConsoleCommand("HumanController", "useItem",                &HumanController::useItem       ).addShortcut();
+    _SetConsoleCommand("HumanController", "cycleNavigationFocus",   &HumanController::cycleNavigationFocus).addShortcut();
+    _SetConsoleCommand("HumanController", "releaseNavigationFocus", &HumanController::releaseNavigationFocus).addShortcut();
 
     CreateUnloadableFactory(HumanController);
Index: code/branches/consolecommands3/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/controllers/NewHumanController.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/controllers/NewHumanController.cc	(revision 7219)
@@ -49,8 +49,8 @@
 namespace orxonox
 {
-    SetConsoleCommand(NewHumanController, changeMode, false).keybindMode(KeybindMode::OnPress);
-    SetConsoleCommand(NewHumanController, accelerate, false).keybindMode(KeybindMode::OnPress);
-    SetConsoleCommand(NewHumanController, decelerate, false).keybindMode(KeybindMode::OnPress);
-    SetConsoleCommand(NewHumanController, unfire,      true).keybindMode(KeybindMode::OnRelease);
+    _SetConsoleCommand("NewHumanController", "changeMode", &NewHumanController::changeMode).keybindMode(KeybindMode::OnPress);
+    _SetConsoleCommand("NewHumanController", "accelerate", &NewHumanController::accelerate).keybindMode(KeybindMode::OnPress);
+    _SetConsoleCommand("NewHumanController", "decelerate", &NewHumanController::decelerate).keybindMode(KeybindMode::OnPress);
+    _SetConsoleCommand("NewHumanController", "unfire",     &NewHumanController::unfire    ).keybindMode(KeybindMode::OnRelease).addShortcut();
 
     CreateUnloadableFactory(NewHumanController);
Index: code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc	(revision 7219)
@@ -48,4 +48,18 @@
     DeclareGameState(GSMainMenu, "mainMenu", false, true);
 
+    static const std::string __CC_startStandalone_name      = "startGame";
+    static const std::string __CC_startServer_name          = "startServer";
+    static const std::string __CC_startClient_name          = "startClient";
+    static const std::string __CC_startDedicated_name       = "startDedicated";
+    static const std::string __CC_startMainMenu_name        = "startMainMenu";
+    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);
+
     GSMainMenu::GSMainMenu(const GameStateInfo& info)
         : GameState(info)
@@ -89,12 +103,10 @@
         InputManager::getInstance().enterState("MainMenuHackery");
 
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startStandalone), "startGame"));
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startServer), "startServer"));
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startClient), "startClient"));
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startDedicated), "startDedicated"));
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startMainMenu), "startMainMenu"));
-
-        // create command to change sound path
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::setMainMenuSoundPath, this), "setMMSoundPath"));
+        _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();
@@ -122,4 +134,11 @@
         GUIManager::hideGUI("MainMenu");
         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);
     }
 
Index: code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc	(revision 7219)
@@ -41,5 +41,11 @@
 {
     DeclareGameState(GSRoot, "root", false, false);
-    SetConsoleCommandShortcut(GSRoot, printObjects);
+
+    static const std::string __CC_setTimeFactor_name = "setTimeFactor";
+    static const std::string __CC_pause_name = "pause";
+
+    _SetConsoleCommand("printObjects", &GSRoot::printObjects);
+    _SetConsoleCommand(__CC_setTimeFactor_name, &GSRoot::setTimeFactor).accessLevel(AccessLevel::Master).defaultValues(1.0);
+    _SetConsoleCommand(__CC_pause_name,         &GSRoot::pause        ).accessLevel(AccessLevel::Master);
 
     registerStaticNetworkFunction(&TimeFactorListener::setTimeFactor);
@@ -76,15 +82,12 @@
         TimeFactorListener::setTimeFactor(1.0f);
 
-        // time factor console command
-        ConsoleCommand* command = createConsoleCommand(createFunctor(&GSRoot::setTimeFactor, this), "setTimeFactor");
-        CommandExecutor::addConsoleCommandShortcut(command).accessLevel(AccessLevel::Offline).defaultValue(0, 1.0);
-
-        // time factor console command
-        command = createConsoleCommand(createFunctor(&GSRoot::pause, this), "pause");
-        CommandExecutor::addConsoleCommandShortcut(command).accessLevel(AccessLevel::Offline);
+        _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);
     }
 
Index: code/branches/consolecommands3/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gametypes/Gametype.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/gametypes/Gametype.cc	(revision 7219)
@@ -79,11 +79,4 @@
         else
             this->scoreboard_ = 0;
-
-        /* HACK HACK HACK */
-        this->hackAddBots_ = createConsoleCommand( createFunctor(&Gametype::addBots, this), "hackAddBots");
-        this->hackKillBots_ = createConsoleCommand( createFunctor(&Gametype::killBots, this), "hackKillBots");
-        CommandExecutor::addConsoleCommandShortcut( this->hackAddBots_ );
-        CommandExecutor::addConsoleCommandShortcut( this->hackKillBots_ );
-        /* HACK HACK HACK */
     }
 
@@ -93,8 +86,4 @@
         {
             this->gtinfo_->destroy();
-            if( this->hackAddBots_ )
-                delete this->hackAddBots_;
-            if( this->hackKillBots_ )
-                delete this->hackKillBots_;
         }
     }
Index: code/branches/consolecommands3/src/orxonox/gametypes/Gametype.h
===================================================================
--- code/branches/consolecommands3/src/orxonox/gametypes/Gametype.h	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/gametypes/Gametype.h	(revision 7219)
@@ -184,9 +184,4 @@
             // Config Values
             std::string scoreboardTemplate_;
-
-            /* HACK HACK HACK */
-            ConsoleCommand* hackAddBots_;
-            ConsoleCommand* hackKillBots_;
-            /* HACK HACK HACK */
     };
 }
Index: code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.cc	(revision 7219)
@@ -58,6 +58,6 @@
     const float CHAR_WIDTH = 7.45f; // fix this please - determine the char-width dynamically
 
-    SetConsoleCommand(InGameConsole, openConsole, true);
-    SetConsoleCommand(InGameConsole, closeConsole, true);
+    _SetConsoleCommand("InGameConsole", "openConsole", &InGameConsole::openConsole).addShortcut();
+    _SetConsoleCommand("InGameConsole", "closeConsole", &InGameConsole::closeConsole).addShortcut();
 
     ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
Index: code/branches/consolecommands3/src/orxonox/overlays/OrxonoxOverlay.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/overlays/OrxonoxOverlay.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/overlays/OrxonoxOverlay.cc	(revision 7219)
@@ -57,8 +57,8 @@
     std::map<std::string, OrxonoxOverlay*> OrxonoxOverlay::overlays_s;
 
-    SetConsoleCommand(OrxonoxOverlay, scaleOverlay, false).accessLevel(AccessLevel::User);
-    SetConsoleCommand(OrxonoxOverlay, scrollOverlay, false).accessLevel(AccessLevel::User);
-    SetConsoleCommand(OrxonoxOverlay, toggleVisibility, false).accessLevel(AccessLevel::User);
-    SetConsoleCommand(OrxonoxOverlay, rotateOverlay, false).accessLevel(AccessLevel::User);
+    _SetConsoleCommand("OrxonoxOverlay", "scaleOverlay",     &OrxonoxOverlay::scaleOverlay);
+    _SetConsoleCommand("OrxonoxOverlay", "scrollOverlay",    &OrxonoxOverlay::scrollOverlay);
+    _SetConsoleCommand("OrxonoxOverlay", "toggleVisibility", &OrxonoxOverlay::toggleVisibility);
+    _SetConsoleCommand("OrxonoxOverlay", "rotateOverlay",    &OrxonoxOverlay::rotateOverlay);
 
     OrxonoxOverlay::OrxonoxOverlay(BaseObject* creator)
Index: code/branches/consolecommands3/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/overlays/OverlayGroup.cc	(revision 7207)
+++ code/branches/consolecommands3/src/orxonox/overlays/OverlayGroup.cc	(revision 7219)
@@ -43,7 +43,7 @@
     CreateFactory(OverlayGroup);
 
-    SetConsoleCommand(OverlayGroup, toggleVisibility, false).accessLevel(AccessLevel::User);
-    SetConsoleCommand(OverlayGroup, scaleGroup, false).accessLevel(AccessLevel::User);
-    SetConsoleCommand(OverlayGroup, scrollGroup, false).accessLevel(AccessLevel::User);
+    _SetConsoleCommand("OverlayGroup", "toggleVisibility", &OverlayGroup::toggleVisibility);
+    _SetConsoleCommand("OverlayGroup", "scaleGroup",       &OverlayGroup::scaleGroup);
+    _SetConsoleCommand("OverlayGroup", "scrollGroup",      &OverlayGroup::scrollGroup);
 
     OverlayGroup::OverlayGroup(BaseObject* creator)
