diff --git a/Source/RMG-Input/UserInterface/Resource/Controller_Pressed_LeftTrigger.svg b/Source/RMG-Input/UserInterface/Resource/Controller_Pressed_LeftShoulder.svg
similarity index 100%
rename from Source/RMG-Input/UserInterface/Resource/Controller_Pressed_LeftTrigger.svg
rename to Source/RMG-Input/UserInterface/Resource/Controller_Pressed_LeftShoulder.svg
diff --git a/Source/RMG-Input/UserInterface/Resource/Controller_Pressed_RightTrigger.svg b/Source/RMG-Input/UserInterface/Resource/Controller_Pressed_RightShoulder.svg
similarity index 100%
rename from Source/RMG-Input/UserInterface/Resource/Controller_Pressed_RightTrigger.svg
rename to Source/RMG-Input/UserInterface/Resource/Controller_Pressed_RightShoulder.svg
diff --git a/Source/RMG-Input/UserInterface/UIResources.qrc b/Source/RMG-Input/UserInterface/UIResources.qrc
index 6b5623de..11020280 100644
--- a/Source/RMG-Input/UserInterface/UIResources.qrc
+++ b/Source/RMG-Input/UserInterface/UIResources.qrc
@@ -13,8 +13,8 @@
   <file>Resource/Controller_Pressed_CButtonLeft.svg</file>
   <file>Resource/Controller_Pressed_CButtonRight.svg</file>
   <file>Resource/Controller_Pressed_Start.svg</file>
-  <file>Resource/Controller_Pressed_LeftTrigger.svg</file>
-  <file>Resource/Controller_Pressed_RightTrigger.svg</file>
+  <file>Resource/Controller_Pressed_LeftShoulder.svg</file>
+  <file>Resource/Controller_Pressed_RightShoulder.svg</file>
   <file>Resource/Controller_Pressed_ZTrigger.svg</file>
   <file>Resource/RMG.png</file>
 </qresource>
diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp b/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp
index 5d6b7bb3..63377be5 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp
@@ -132,8 +132,8 @@ void ControllerImageWidget::paintEvent(QPaintEvent *event)
         { N64ControllerButton::CButtonDown, ":Resource/Controller_Pressed_CButtonDown.svg" },
         { N64ControllerButton::CButtonLeft, ":Resource/Controller_Pressed_CButtonLeft.svg" },
         { N64ControllerButton::CButtonRight, ":Resource/Controller_Pressed_CButtonRight.svg" },
-        { N64ControllerButton::LeftTrigger, ":Resource/Controller_Pressed_LeftTrigger.svg" },
-        { N64ControllerButton::RightTrigger, ":Resource/Controller_Pressed_RightTrigger.svg" },
+        { N64ControllerButton::LeftShoulder, ":Resource/Controller_Pressed_LeftShoulder.svg" },
+        { N64ControllerButton::RightShoulder, ":Resource/Controller_Pressed_RightShoulder.svg" },
         { N64ControllerButton::ZTrigger, ":Resource/Controller_Pressed_ZTrigger.svg" }
     };
 
diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp
index 13d5dddc..c67e2144 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp
@@ -59,8 +59,8 @@ ControllerWidget::ControllerWidget(QWidget* parent, EventFilter* eventFilter) :
         { N64ControllerButton::CButtonDown, this->cbuttonDownButton },
         { N64ControllerButton::CButtonLeft, this->cbuttonLeftButton  },
         { N64ControllerButton::CButtonRight, this->cbuttonRightButton },
-        { N64ControllerButton::LeftTrigger, this->leftTriggerButton },
-        { N64ControllerButton::RightTrigger, this->rightTriggerButton },
+        { N64ControllerButton::LeftShoulder, this->leftShoulderButton },
+        { N64ControllerButton::RightShoulder, this->rightShoulderButton },
         { N64ControllerButton::ZTrigger, this->zTriggerButton }
     });
 
@@ -85,8 +85,8 @@ ControllerWidget::ControllerWidget(QWidget* parent, EventFilter* eventFilter) :
         { this->cbuttonDownButton, SettingsID::Input_CButtonDown_InputType, SettingsID::Input_CButtonDown_Name, SettingsID::Input_CButtonDown_Data, SettingsID::Input_CButtonDown_ExtraData },
         { this->cbuttonLeftButton, SettingsID::Input_CButtonLeft_InputType, SettingsID::Input_CButtonLeft_Name, SettingsID::Input_CButtonLeft_Data, SettingsID::Input_CButtonLeft_ExtraData },
         { this->cbuttonRightButton, SettingsID::Input_CButtonRight_InputType, SettingsID::Input_CButtonRight_Name, SettingsID::Input_CButtonRight_Data, SettingsID::Input_CButtonRight_ExtraData },
-        { this->leftTriggerButton, SettingsID::Input_LeftTrigger_InputType, SettingsID::Input_LeftTrigger_Name, SettingsID::Input_LeftTrigger_Data, SettingsID::Input_LeftTrigger_ExtraData },
-        { this->rightTriggerButton, SettingsID::Input_RightTrigger_InputType, SettingsID::Input_RightTrigger_Name, SettingsID::Input_RightTrigger_Data, SettingsID::Input_RightTrigger_ExtraData },
+        { this->leftShoulderButton, SettingsID::Input_LeftShoulder_InputType, SettingsID::Input_LeftShoulder_Name, SettingsID::Input_LeftShoulder_Data, SettingsID::Input_LeftShoulder_ExtraData },
+        { this->rightShoulderButton, SettingsID::Input_RightShoulder_InputType, SettingsID::Input_RightShoulder_Name, SettingsID::Input_RightShoulder_Data, SettingsID::Input_RightShoulder_ExtraData },
         { this->zTriggerButton, SettingsID::Input_ZTrigger_InputType, SettingsID::Input_ZTrigger_Name, SettingsID::Input_ZTrigger_Data, SettingsID::Input_ZTrigger_ExtraData },
         { this->analogStickUpButton, SettingsID::Input_AnalogStickUp_InputType, SettingsID::Input_AnalogStickUp_Name, SettingsID::Input_AnalogStickUp_Data, SettingsID::Input_AnalogStickUp_ExtraData },
         { this->analogStickDownButton, SettingsID::Input_AnalogStickDown_InputType, SettingsID::Input_AnalogStickDown_Name, SettingsID::Input_AnalogStickDown_Data, SettingsID::Input_AnalogStickDown_ExtraData },
@@ -154,8 +154,8 @@ ControllerWidget::ControllerWidget(QWidget* parent, EventFilter* eventFilter) :
         this->cbuttonLeftButton,
         this->cbuttonRightButton,
         // triggers
-        this->leftTriggerButton,
-        this->rightTriggerButton,
+        this->leftShoulderButton,
+        this->rightShoulderButton,
         this->zTriggerButton,
         // buttons
         this->aButton,
@@ -203,8 +203,8 @@ void ControllerWidget::initializeMappingButtons()
         { this->cbuttonLeftButton, this->cbuttonLeftAddButton, this->cbuttonLeftRemoveButton },
         { this->cbuttonRightButton, this->cbuttonRightAddButton, this->cbuttonRightRemoveButton },
         // triggers
-        { this->leftTriggerButton, this->leftTriggerAddButton, this->leftTriggerRemoveButton },
-        { this->rightTriggerButton, this->rightTriggerAddButton, this->rightTriggerRemoveButton },
+        { this->leftShoulderButton, this->leftShoulderAddButton, this->leftShoulderRemoveButton },
+        { this->rightShoulderButton, this->rightShoulderAddButton, this->rightShoulderRemoveButton },
         { this->zTriggerButton, this->zTriggerAddButton, this->zTriggerRemoveButton },
         // buttons
         { this->aButton, this->aAddButton, this->aRemoveButton },
@@ -373,8 +373,8 @@ void ControllerWidget::setPluggedIn(bool value)
         this->cbuttonRightButton, this->cbuttonRightAddButton, this->cbuttonRightRemoveButton,
         // triggers
         this->analogStickGroupBox,
-        this->leftTriggerButton, this->leftTriggerAddButton, this->leftTriggerRemoveButton,
-        this->rightTriggerButton, this->rightTriggerAddButton, this->rightTriggerRemoveButton,
+        this->leftShoulderButton, this->leftShoulderAddButton, this->leftShoulderRemoveButton,
+        this->rightShoulderButton, this->rightShoulderAddButton, this->rightShoulderRemoveButton,
         this->zTriggerButton, this->zTriggerAddButton, this->zTriggerRemoveButton,
         // buttons
         this->buttonsGroupBox,
diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.ui b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.ui
index 81f547b4..4f6ca2e0 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.ui
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.ui
@@ -37,7 +37,7 @@
            </sizepolicy>
           </property>
           <property name="sizeAdjustPolicy">
-           <enum>QComboBox::AdjustToContents</enum>
+           <enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
           </property>
          </widget>
         </item>
@@ -73,7 +73,7 @@
      <item>
       <spacer name="horizontalSpacer_8">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -104,7 +104,7 @@
            </sizepolicy>
           </property>
           <property name="sizeAdjustPolicy">
-           <enum>QComboBox::AdjustToContents</enum>
+           <enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
           </property>
          </widget>
         </item>
@@ -127,7 +127,7 @@
      <item>
       <spacer name="horizontalSpacer_4">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -158,10 +158,10 @@
            <number>100</number>
           </property>
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="tickPosition">
-           <enum>QSlider::TicksBelow</enum>
+           <enum>QSlider::TickPosition::TicksBelow</enum>
           </property>
           <property name="tickInterval">
            <number>10</number>
@@ -178,7 +178,7 @@
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -193,7 +193,7 @@
        <item>
         <spacer name="verticalSpacer_3">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -625,10 +625,10 @@
              <number>100</number>
             </property>
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="tickPosition">
-             <enum>QSlider::TicksBelow</enum>
+             <enum>QSlider::TickPosition::TicksBelow</enum>
             </property>
             <property name="tickInterval">
              <number>15</number>
@@ -641,7 +641,7 @@
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -663,7 +663,7 @@
          <item>
           <spacer name="horizontalSpacer_5">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -678,26 +678,26 @@
            <item>
             <widget class="QLabel" name="label_3">
              <property name="text">
-              <string>L-Trigger: </string>
+              <string>L-Shoulder: </string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="MappingButton" name="leftTriggerButton">
+            <widget class="MappingButton" name="leftShoulderButton">
              <property name="text">
               <string/>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="AddMappingButton" name="leftTriggerAddButton">
+            <widget class="AddMappingButton" name="leftShoulderAddButton">
              <property name="text">
               <string>+</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="RemoveMappingButton" name="leftTriggerRemoveButton">
+            <widget class="RemoveMappingButton" name="leftShoulderRemoveButton">
              <property name="text">
               <string>-</string>
              </property>
@@ -706,7 +706,7 @@
            <item>
             <spacer name="horizontalSpacer_7">
              <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+              <enum>Qt::Orientation::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -721,7 +721,7 @@
          <item>
           <spacer name="horizontalSpacer_9">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -736,26 +736,26 @@
            <item>
             <widget class="QLabel" name="label_6">
              <property name="text">
-              <string>R-Trigger: </string>
+              <string>R-Shoulder: </string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="MappingButton" name="rightTriggerButton">
+            <widget class="MappingButton" name="rightShoulderButton">
              <property name="text">
               <string/>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="AddMappingButton" name="rightTriggerAddButton">
+            <widget class="AddMappingButton" name="rightShoulderAddButton">
              <property name="text">
               <string>+</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="RemoveMappingButton" name="rightTriggerRemoveButton">
+            <widget class="RemoveMappingButton" name="rightShoulderRemoveButton">
              <property name="text">
               <string>-</string>
              </property>
@@ -766,7 +766,7 @@
          <item>
           <spacer name="horizontalSpacer_6">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -799,7 +799,7 @@
          <item>
           <spacer name="horizontalSpacer_10">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -847,7 +847,7 @@
          <item>
           <spacer name="horizontalSpacer_2">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -895,7 +895,7 @@
          <item>
           <spacer name="horizontalSpacer_11">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -914,7 +914,7 @@
        <item>
         <spacer name="verticalSpacer_4">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -1243,7 +1243,7 @@
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -1279,7 +1279,7 @@
      <item>
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
diff --git a/Source/RMG-Input/common.hpp b/Source/RMG-Input/common.hpp
index b1d39b7e..25578860 100644
--- a/Source/RMG-Input/common.hpp
+++ b/Source/RMG-Input/common.hpp
@@ -27,8 +27,8 @@ enum class N64ControllerButton
     CButtonDown,
     CButtonLeft,
     CButtonRight,
-    LeftTrigger,
-    RightTrigger,
+    LeftShoulder,
+    RightShoulder,
     ZTrigger,
     Invalid
 };
diff --git a/Source/RMG-Input/main.cpp b/Source/RMG-Input/main.cpp
index 98689b89..bf4e79bd 100644
--- a/Source/RMG-Input/main.cpp
+++ b/Source/RMG-Input/main.cpp
@@ -111,8 +111,8 @@ struct InputProfile
     InputMapping Button_CButtonDown;
     InputMapping Button_CButtonLeft;
     InputMapping Button_CButtonRight;
-    InputMapping Button_LeftTrigger;
-    InputMapping Button_RightTrigger;
+    InputMapping Button_LeftShoulder;
+    InputMapping Button_RightShoulder;
     InputMapping Button_ZTrigger;
 
     // analog stick
@@ -342,8 +342,8 @@ static void load_settings(void)
         LOAD_INPUT_MAPPING(Button_CButtonDown,  Input_CButtonDown);
         LOAD_INPUT_MAPPING(Button_CButtonLeft,  Input_CButtonLeft);
         LOAD_INPUT_MAPPING(Button_CButtonRight, Input_CButtonRight);
-        LOAD_INPUT_MAPPING(Button_LeftTrigger,  Input_LeftTrigger);
-        LOAD_INPUT_MAPPING(Button_RightTrigger, Input_RightTrigger);
+        LOAD_INPUT_MAPPING(Button_LeftShoulder,  Input_LeftShoulder);
+        LOAD_INPUT_MAPPING(Button_RightShoulder, Input_RightShoulder);
         LOAD_INPUT_MAPPING(Button_ZTrigger,     Input_ZTrigger);
         LOAD_INPUT_MAPPING(AnalogStick_Up,      Input_AnalogStickUp);
         LOAD_INPUT_MAPPING(AnalogStick_Down,    Input_AnalogStickDown);
@@ -1274,8 +1274,8 @@ EXPORT void CALL GetKeys(int Control, BUTTONS* Keys)
     Keys->D_CBUTTON    = get_button_state(profile, &profile->Button_CButtonDown);
     Keys->L_CBUTTON    = get_button_state(profile, &profile->Button_CButtonLeft);
     Keys->R_CBUTTON    = get_button_state(profile, &profile->Button_CButtonRight);
-    Keys->L_TRIG       = get_button_state(profile, &profile->Button_LeftTrigger);
-    Keys->R_TRIG       = get_button_state(profile, &profile->Button_RightTrigger);
+    Keys->L_TRIG       = get_button_state(profile, &profile->Button_LeftShoulder);
+    Keys->R_TRIG       = get_button_state(profile, &profile->Button_RightShoulder);
     Keys->Z_TRIG       = get_button_state(profile, &profile->Button_ZTrigger);
 
     double inputX = 0, inputY = 0;