Index: code/branches/consolecommands3/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- code/branches/consolecommands3/src/modules/designtools/ScreenshotManager.cc	(revision 7207)
+++ code/branches/consolecommands3/src/modules/designtools/ScreenshotManager.cc	(revision 7219)
@@ -20,5 +20,5 @@
 {
     ManageScopedSingleton(ScreenshotManager, ScopeID::Graphics, false);
-    SetConsoleCommandAlias(ScreenshotManager, makeScreenshot_s, "printScreenHD", true);
+    _SetConsoleCommand("printScreenHD", &ScreenshotManager::makeScreenshot_s);
 
     ScreenshotManager::ScreenshotManager()
Index: code/branches/consolecommands3/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- code/branches/consolecommands3/src/modules/designtools/SkyboxGenerator.cc	(revision 7207)
+++ code/branches/consolecommands3/src/modules/designtools/SkyboxGenerator.cc	(revision 7219)
@@ -50,5 +50,5 @@
 {
 
-    SetConsoleCommand(SkyboxGenerator, createSkybox, true);
+    _SetConsoleCommand("SkyboxGenerator", "createSkybox", &SkyboxGenerator::createSkybox).addShortcut();
 
     ManageScopedSingleton(SkyboxGenerator, ScopeID::Graphics, false);
@@ -79,5 +79,5 @@
             if(!this->captionsRemoved_)
             {
-                CommandExecutor::execute("setGametypeStatus false");
+                CommandExecutor::execute("GametypeStatus displayCaption false");
                 this->captionsRemoved_ = true;
                 return;
@@ -145,5 +145,5 @@
                 takeScreenshot_ = false;
                 CommandExecutor::execute("pause");
-                CommandExecutor::execute("setGametypeStatus true");
+                CommandExecutor::execute("GametypeStatus displayCaption true");
                 this->captionsRemoved_ = false;
             }
Index: code/branches/consolecommands3/src/modules/objects/triggers/Trigger.cc
===================================================================
--- code/branches/consolecommands3/src/modules/objects/triggers/Trigger.cc	(revision 7207)
+++ code/branches/consolecommands3/src/modules/objects/triggers/Trigger.cc	(revision 7219)
@@ -38,5 +38,5 @@
 {
 
-  SetConsoleCommand(Trigger, debugFlares, false).defaultValues(false);
+  _SetConsoleCommand("Trigger", "debugFlares", &Trigger::debugFlares).defaultValues(false);
 
   CreateFactory(Trigger);
Index: code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.cc
===================================================================
--- code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.cc	(revision 7207)
+++ code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.cc	(revision 7219)
@@ -41,6 +41,8 @@
     CreateFactory(GametypeStatus);
 
-    /*static*/ bool GametypeStatus::noCaption_s = false;
-    SetConsoleCommand(GametypeStatus, setGametypeStatus, true);
+    static const std::string __CC_GametypeStatus_name = "GametypeStatus";
+    static const std::string __CC_displayCaption_name = "displayCaption";
+
+    _SetConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name, &GametypeStatus::setDisplayCaption);
 
     GametypeStatus::GametypeStatus(BaseObject* creator) : OverlayText(creator)
@@ -49,8 +51,12 @@
 
         this->owner_ = 0;
+        this->bNoCaption_ = false;
+
+        _ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(this);
     }
 
     GametypeStatus::~GametypeStatus()
     {
+        _ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(0);
     }
 
@@ -64,5 +70,5 @@
             ControllableEntity* ce = this->owner_->getControllableEntity();
 
-            if(GametypeStatus::noCaption_s) // No captions are displayed.
+            if (this->bNoCaption_) // No captions are displayed.
             {
                 this->setCaption("");
@@ -105,7 +111,7 @@
         If true captions are displayed, if false, not.
     */
-    /*static*/ void GametypeStatus::setGametypeStatus(bool bValue)
+    void GametypeStatus::setDisplayCaption(bool bValue)
     {
-        GametypeStatus::noCaption_s = !bValue;
+        this->bNoCaption_ = !bValue;
     }
 
Index: code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.h
===================================================================
--- code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.h	(revision 7207)
+++ code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.h	(revision 7219)
@@ -46,9 +46,9 @@
             virtual void changedOwner();
 
-            static void setGametypeStatus(bool bValue); //!< Toggles whether the gametype status is displayed.
+            void setDisplayCaption(bool bValue); //!< Toggles whether the gametype status is displayed.
 
         private:
             PlayerInfo* owner_;
-            static bool noCaption_s;
+            bool bNoCaption_;
 
     };
