diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index d50c61630..d0c6cd864 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -967,7 +967,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
       if(pressed)
       {
         myPJoyHandler->changeDigitalDeadZone(-1);
-        myGlobalKeyHandler->setSetting(GlobalKeyHandler::Setting::DEADZONE);
+        myGlobalKeyHandler->setSetting(GlobalKeyHandler::Setting::DIGITAL_DEADZONE);
       }
       return;
 
@@ -975,7 +975,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
       if(pressed)
       {
         myPJoyHandler->changeDigitalDeadZone(+1);
-        myGlobalKeyHandler->setSetting(GlobalKeyHandler::Setting::DEADZONE);
+        myGlobalKeyHandler->setSetting(GlobalKeyHandler::Setting::DIGITAL_DEADZONE);
       }
       return;
 
diff --git a/src/emucore/GlobalKeyHandler.cxx b/src/emucore/GlobalKeyHandler.cxx
index 8b2284b1e..6b9270e21 100644
--- a/src/emucore/GlobalKeyHandler.cxx
+++ b/src/emucore/GlobalKeyHandler.cxx
@@ -236,7 +236,7 @@ bool GlobalKeyHandler::skipInputSetting() const
 
   return (!grabMouseAllowed && mySetting == Setting::GRAB_MOUSE)
     || (!joystick
-      && (mySetting == Setting::DEADZONE
+      && (mySetting == Setting::DIGITAL_DEADZONE
       || mySetting == Setting::FOUR_DIRECTIONS))
     || (!paddle
       && (mySetting == Setting::ANALOG_DEADZONE
@@ -377,7 +377,7 @@ GlobalKeyHandler::SettingData GlobalKeyHandler::getSettingData(const Setting set
     {Setting::SCANLINES,              {true,  std::bind(&TIASurface::setScanlineIntensity, &myOSystem.frameBuffer().tiaSurface(), _1)}},
     {Setting::INTERPOLATION,          {false, std::bind(&Console::toggleInter, &myOSystem.console(), _1)}},
     // *** Input group ***
-    {Setting::DEADZONE,               {true,  std::bind(&PhysicalJoystickHandler::changeDigitalDeadZone, &joyHandler(), _1)}},
+    {Setting::DIGITAL_DEADZONE,       {true,  std::bind(&PhysicalJoystickHandler::changeDigitalDeadZone, &joyHandler(), _1)}},
     {Setting::ANALOG_DEADZONE,        {true,  std::bind(&PhysicalJoystickHandler::changeAnalogPaddleDeadZone, &joyHandler(), _1)}},
     {Setting::ANALOG_SENSITIVITY,     {true,  std::bind(&PhysicalJoystickHandler::changeAnalogPaddleSensitivity, &joyHandler(), _1)}},
     {Setting::ANALOG_LINEARITY,       {true,  std::bind(&PhysicalJoystickHandler::changeAnalogPaddleLinearity, &joyHandler(), _1)}},
diff --git a/src/emucore/GlobalKeyHandler.hxx b/src/emucore/GlobalKeyHandler.hxx
index cb181efb6..ee378d0d6 100644
--- a/src/emucore/GlobalKeyHandler.hxx
+++ b/src/emucore/GlobalKeyHandler.hxx
@@ -72,7 +72,7 @@ class GlobalKeyHandler
       SCANLINES,
       INTERPOLATION,
       // *** Input group ***
-      DEADZONE,
+      DIGITAL_DEADZONE,
       ANALOG_DEADZONE,
       ANALOG_SENSITIVITY,
       ANALOG_LINEARITY,
@@ -125,7 +125,7 @@ class GlobalKeyHandler
       NUM_ADJ,
       START_AV_ADJ = VOLUME,
       END_AV_ADJ = INTERPOLATION,
-      START_INPUT_ADJ = DEADZONE,
+      START_INPUT_ADJ = DIGITAL_DEADZONE,
       END_INPUT_ADJ = MOUSE_RANGE,
       START_DEBUG_ADJ = STATS,
       END_DEBUG_ADJ = JITTER,