diff --git a/source/duke3d/src/_functio.h b/source/duke3d/src/_functio.h
index 3eaa8554f..ad8168556 100644
--- a/source/duke3d/src/_functio.h
+++ b/source/duke3d/src/_functio.h
@@ -46,7 +46,7 @@ char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN] =
    "Fire",
    "Open",
    "Run",
-   "Run_Mode",
+   "AutoRun",
    "Jump",
    "Crouch",
    "Look_Up",
@@ -57,18 +57,6 @@ char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN] =
    "Strafe_Right",
    "Aim_Up",
    "Aim_Down",
-#ifndef EDUKE32_STANDALONE
-   "Mighty Foot",
-   "Pistol",
-   "Shotgun",
-   "Ripper",
-   "RPG",
-   "Pipebomb",
-   "Shrinker", // if v1.4 redefine to "Shrinker/Expander" in CONFIG_SetDefaults
-   "Devastator",
-   "Laser_Tripbomb",
-   "Freezer",
-#else
    "Weapon_1",
    "Weapon_2",
    "Weapon_3",
@@ -79,47 +67,46 @@ char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN] =
    "Weapon_8",
    "Weapon_9",
    "Weapon_10",
-#endif
-   "Use_Inventory",
+   "Inventory",
    "Inventory_Left",
    "Inventory_Right",
 #ifndef EDUKE32_STANDALONE
-   "Holoduke",
+   "Holo_Duke",
    "Jetpack",
-   "Night_Vision_Goggles",
-   "Portable_Medkit",
+   "NightVision",
+   "MedKit",
 #else
-   "Inventory_3",
-   "Inventory_4",
-   "Inventory_5",
-   "Inventory_1",
+   "",
+   "",
+   "",
+   "",
 #endif
-   "Turn_Around",
-   "Send_Message",
+   "TurnAround",
+   "SendMessage",
    "Map",
    "Shrink_Screen",
    "Enlarge_Screen",
    "Center_View",
    "Holster_Weapon",
-   "Show_Weapon_Indicator",
+   "Show_Opponents_Weapon",
    "Map_Follow_Mode",
-   "Show_Peer_View",
+   "See_Coop_View",
    "Mouse_Aiming",
    "Toggle_Crosshair",
 #ifndef EDUKE32_STANDALONE
    "Steroids",
    "Quick_Kick",
 #else
-   "Inventory_2",
-   "Melee_Attack",
+   "",
+   "",
 #endif
    "Next_Weapon",
    "Previous_Weapon",
    "Show_Console",
 #ifndef EDUKE32_STANDALONE
-   "Show_Dukematch_Scores",
+   "Show_DukeMatch_Scores",
 #else
-   "Show_Deathmatch_Scores",
+   "Show_Multiplayer_Scores",
 #endif
    "Dpad_Select",
    "Dpad_Aiming",
diff --git a/source/duke3d/src/cheats.cpp b/source/duke3d/src/cheats.cpp
index 058a4eca8..38b4eeda1 100644
--- a/source/duke3d/src/cheats.cpp
+++ b/source/duke3d/src/cheats.cpp
@@ -188,8 +188,8 @@ void G_SetupCheats(void)
         Bstrcpy(CheatStrings[24], "adebug");
         Bstrcpy(CheatStrings[26], "acgs");
 
-        Bstrcpy(g_gametypeNames[0], "Gruntmatch (Spawn)");
-        Bstrcpy(g_gametypeNames[2], "Gruntmatch (No Spawn)");
+        Bstrcpy(g_gametypeNames[0], "GruntMatch (Spawn)");
+        Bstrcpy(g_gametypeNames[2], "GruntMatch (No Spawn)");
     }
 }
 #endif
diff --git a/source/duke3d/src/config.cpp b/source/duke3d/src/config.cpp
index 330f15763..3ead450d4 100644
--- a/source/duke3d/src/config.cpp
+++ b/source/duke3d/src/config.cpp
@@ -281,28 +281,6 @@ void CONFIG_SetDefaults(void)
     // JBF 20031211
 
     CONFIG_SetDefaultKeys(keydefaults);
-    if (PLUTOPAK)
-        strcpy(gamefunctions[gamefunc_Weapon_7], "Shrinker/Expander");
-
-    // Caribbean
-#if 0
-    {
-        strcpy(gamefunctions[gamefunc_Weapon_1], "Sandal_Foot");
-        strcpy(gamefunctions[gamefunc_Weapon_2], "Squirt_Gun");
-        strcpy(gamefunctions[gamefunc_Weapon_3], "Super_Soak'em");
-        strcpy(gamefunctions[gamefunc_Weapon_4], "Triple_Poison_Shooter");
-        strcpy(gamefunctions[gamefunc_Weapon_5], "Coconut_Launcher");
-        strcpy(gamefunctions[gamefunc_Weapon_6], "Pineapple");
-        strcpy(gamefunctions[gamefunc_Weapon_7], "Voodoo_Ring");
-        strcpy(gamefunctions[gamefunc_Weapon_8], "Conchanator");
-        strcpy(gamefunctions[gamefunc_Weapon_9], "Voodoo_Tripbomb");
-        strcpy(gamefunctions[gamefunc_Weapon_10], "Ice_Crusher");
-        strcpy(gamefunctions[gamefunc_NightVision], "Sunglasses");
-        strcpy(gamefunctions[gamefunc_MedKit], "Crate_of_Bananas");
-        strcpy(gamefunctions[gamefunc_Steroids], "Hot_Sauce");
-    }
-#endif
-    // TODO: NAM, WWII GI
 
     memset(ud.config.MouseFunctions, -1, sizeof(ud.config.MouseFunctions));
     for (i=0; i<MAXMOUSEBUTTONS; i++)
diff --git a/source/duke3d/src/global.cpp b/source/duke3d/src/global.cpp
index f10af054c..3e02eeb09 100644
--- a/source/duke3d/src/global.cpp
+++ b/source/duke3d/src/global.cpp
@@ -36,7 +36,7 @@ extern "C" {
 char    g_volumeNames[MAXVOLUMES][33] = { "L.A. Meltdown", "Lunar Apocalypse", "Shrapnel City" };
 char    g_skillNames[MAXSKILLS][33] = { "Piece Of Cake", "Let's Rock", "Come Get Some", "Damn I'm Good" };
 char    g_gametypeNames[MAXGAMETYPES][33]
-= { "Dukematch (Spawn)", "Cooperative Play", "Dukematch (No Spawn)", "Team DM (Spawn)", "Team DM (No Spawn)" };
+= { "DukeMatch (Spawn)", "Cooperative Play", "DukeMatch (No Spawn)", "Team DM (Spawn)", "Team DM (No Spawn)" };
 #else
 char    g_volumeNames[MAXVOLUMES][33];
 char    g_skillNames[MAXSKILLS][33];