diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index ad5eab433..87c763faf 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -38,7 +38,7 @@ button_l=
 button_r=
 button_start=
 button_select=
-button_dbg=
+button_debug=
 button_zl=
 button_zr=
 button_home=
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index b481d3bd6..f1ae2f8c0 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -87,7 +87,7 @@ void Module::UpdatePadCallback(u64 userdata, s64 cycles_late) {
     state.r.Assign(buttons[R - BUTTON_HID_BEGIN]->GetStatus());
     state.start.Assign(buttons[Start - BUTTON_HID_BEGIN]->GetStatus());
     state.select.Assign(buttons[Select - BUTTON_HID_BEGIN]->GetStatus());
-    state.dbg.Assign(buttons[Dbg - BUTTON_HID_BEGIN]->GetStatus());
+    state.debug.Assign(buttons[Debug - BUTTON_HID_BEGIN]->GetStatus());
 
     // Get current circle pad position and update circle pad direction
     float circle_pad_x_f, circle_pad_y_f;
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index e240ecea1..9d2d8d984 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -52,7 +52,7 @@ struct PadState {
         BitField<9, 1, u32> l;
         BitField<10, 1, u32> x;
         BitField<11, 1, u32> y;
-        BitField<12, 1, u32> dbg;
+        BitField<12, 1, u32> debug;
 
         BitField<28, 1, u32> circle_right;
         BitField<29, 1, u32> circle_left;
diff --git a/src/core/settings.h b/src/core/settings.h
index 8b7d821ea..9c4ded86f 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -38,7 +38,7 @@ enum Values {
     R,
     Start,
     Select,
-    Dbg,
+    Debug,
 
     ZL,
     ZR,
@@ -73,7 +73,7 @@ static const std::array<const char*, NumButtons> mapping = {{
     "button_r",
     "button_start",
     "button_select",
-    "button_dbg",
+    "button_debug",
     "button_zl",
     "button_zr",
     "button_home",