diff --git a/source/duke3d/src/_functio.h b/source/duke3d/src/_functio.h
index 87cfcb937..4dfd9941d 100644
--- a/source/duke3d/src/_functio.h
+++ b/source/duke3d/src/_functio.h
@@ -116,7 +116,7 @@ char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN] =
    "Quick_Load",
    "Alt_Weapon",
    "Third_Person_View",
-   "Crouch_Toggle",
+   "Toggle_Crouch",
    };
 
 #ifdef __SETUP__
@@ -185,7 +185,7 @@ const char keydefaults[NUMGAMEFUNCTIONS*2][MAXGAMEFUNCLEN] =
    "F9", "",
    "", "",
    "F7", "",
-   "", "",
+   "C", "",
    };
 
 const char oldkeydefaults[NUMGAMEFUNCTIONS*2][MAXGAMEFUNCLEN] =
diff --git a/source/duke3d/src/config.cpp b/source/duke3d/src/config.cpp
index 3ab984f86..b1ac9adba 100644
--- a/source/duke3d/src/config.cpp
+++ b/source/duke3d/src/config.cpp
@@ -646,7 +646,7 @@ void CONFIG_SetGameControllerDefaultsStandard()
     static GameControllerButtonSetting const buttons[] =
     {
         { GAMECONTROLLER_BUTTON_A, gamefunc_Jump },
-        { GAMECONTROLLER_BUTTON_B, gamefunc_Crouch_Toggle },
+        { GAMECONTROLLER_BUTTON_B, gamefunc_Toggle_Crouch },
         { GAMECONTROLLER_BUTTON_BACK, gamefunc_Map },
         { GAMECONTROLLER_BUTTON_LEFTSTICK, gamefunc_Run },
         { GAMECONTROLLER_BUTTON_RIGHTSTICK, gamefunc_Quick_Kick },
diff --git a/source/duke3d/src/function.h b/source/duke3d/src/function.h
index fc0414f98..3ea45289c 100644
--- a/source/duke3d/src/function.h
+++ b/source/duke3d/src/function.h
@@ -105,7 +105,7 @@ enum GameFunction_t
    gamefunc_Quick_Load,
    gamefunc_Alt_Weapon,
    gamefunc_Third_Person_View,
-   gamefunc_Crouch_Toggle,
+   gamefunc_Toggle_Crouch,
    };
 #ifdef __cplusplus
 }
diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp
index 101590444..f7474bc83 100644
--- a/source/duke3d/src/game.cpp
+++ b/source/duke3d/src/game.cpp
@@ -7394,5 +7394,5 @@ static void G_SetupGameButtons(void)
     CONTROL_DefineFlag(gamefunc_Quick_Load, FALSE);
     CONTROL_DefineFlag(gamefunc_Alt_Weapon,FALSE);
     CONTROL_DefineFlag(gamefunc_Third_Person_View, FALSE);
-    CONTROL_DefineFlag(gamefunc_Crouch_Toggle, FALSE);
+    CONTROL_DefineFlag(gamefunc_Toggle_Crouch, FALSE);
 }
diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp
index acef3c604..e9af03c05 100644
--- a/source/duke3d/src/player.cpp
+++ b/source/duke3d/src/player.cpp
@@ -3050,18 +3050,18 @@ void P_GetInput(int const playerNum)
     int const sectorLotag = pPlayer->cursectnum != -1 ? sector[pPlayer->cursectnum].lotag : 0;
     int const crouchable = pPlayer->on_ground && sectorLotag != 2 && (sectorLotag != 1 || pPlayer->spritebridge);
 
-    if (BUTTON(gamefunc_Crouch_Toggle))
+    if (BUTTON(gamefunc_Toggle_Crouch))
     {
         pPlayer->crouch_toggle = !pPlayer->crouch_toggle && crouchable;
 
         if (crouchable)
-            CONTROL_ClearButton(gamefunc_Crouch_Toggle);
+            CONTROL_ClearButton(gamefunc_Toggle_Crouch);
     }
 
     if (BUTTON(gamefunc_Crouch) || pPlayer->jetpack_on || (!crouchable && pPlayer->on_ground))
         pPlayer->crouch_toggle = 0;
 
-    int const crouching = BUTTON(gamefunc_Crouch) || BUTTON(gamefunc_Crouch_Toggle) || pPlayer->crouch_toggle;
+    int const crouching = BUTTON(gamefunc_Crouch) || BUTTON(gamefunc_Toggle_Crouch) || pPlayer->crouch_toggle;
 
     localInput.bits |= (BUTTON(gamefunc_Jump) << SK_JUMP) | (crouching << SK_CROUCH);