diff --git a/app/src/main/cpp/emu_jni.cpp b/app/src/main/cpp/emu_jni.cpp
index 0426038d..ede43dd5 100644
--- a/app/src/main/cpp/emu_jni.cpp
+++ b/app/src/main/cpp/emu_jni.cpp
@@ -55,7 +55,7 @@ static std::string GetTimeZoneName() {
 }
 
 template<> void skyline::Settings::Update<skyline::KtSettings>(KtSettings newSettings) {
-    operationMode = newSettings.GetBool("operationMode");
+    isDocked = newSettings.GetBool("isDocked");
     usernameValue = newSettings.GetString("usernameValue");
     systemLanguage = newSettings.GetInt<skyline::language::SystemLanguage>("systemLanguage");
     forceTripleBuffering = newSettings.GetBool("forceTripleBuffering");
diff --git a/app/src/main/cpp/skyline/common/settings.h b/app/src/main/cpp/skyline/common/settings.h
index a07cbeea..67c95b11 100644
--- a/app/src/main/cpp/skyline/common/settings.h
+++ b/app/src/main/cpp/skyline/common/settings.h
@@ -12,7 +12,7 @@ namespace skyline {
     class Settings {
       public:
         // System
-        bool operationMode; //!< If the emulated Switch should be handheld or docked
+        bool isDocked; //!< If the emulated Switch should be handheld or docked
         std::string usernameValue; //!< The name set by the user to be supplied to the guest
         language::SystemLanguage systemLanguage; //!< The system language set by the user
 
diff --git a/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.cpp b/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.cpp
index d4995887..029ad890 100644
--- a/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.cpp
+++ b/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.cpp
@@ -15,7 +15,7 @@ namespace skyline::service::am {
         : BaseService(state, manager),
           messageEvent(std::make_shared<type::KEvent>(state, false)),
           defaultDisplayResolutionChangeEvent(std::make_shared<type::KEvent>(state, false)) {
-        operationMode = static_cast<OperationMode>(state.settings->operationMode);
+        operationMode = static_cast<OperationMode>(state.settings->isDocked);
         Logger::Info("Switch to mode: {}", static_cast<bool>(operationMode) ? "Docked" : "Handheld");
         QueueMessage(Message::FocusStateChange);
     }
diff --git a/app/src/main/java/emu/skyline/EmulationActivity.kt b/app/src/main/java/emu/skyline/EmulationActivity.kt
index 458bb83e..a8a7a0c6 100644
--- a/app/src/main/java/emu/skyline/EmulationActivity.kt
+++ b/app/src/main/java/emu/skyline/EmulationActivity.kt
@@ -172,7 +172,7 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
             if (controller.type != ControllerType.None) {
                 val type = when (controller.type) {
                     ControllerType.None -> throw IllegalArgumentException()
-                    ControllerType.HandheldProController -> if (settings.operationMode) ControllerType.ProController.id else ControllerType.HandheldProController.id
+                    ControllerType.HandheldProController -> if (settings.isDocked) ControllerType.ProController.id else ControllerType.HandheldProController.id
                     ControllerType.ProController, ControllerType.JoyConLeft, ControllerType.JoyConRight -> controller.type.id
                 }
 
diff --git a/app/src/main/java/emu/skyline/utils/Settings.kt b/app/src/main/java/emu/skyline/utils/Settings.kt
index c2652a75..a5ff67fb 100644
--- a/app/src/main/java/emu/skyline/utils/Settings.kt
+++ b/app/src/main/java/emu/skyline/utils/Settings.kt
@@ -24,7 +24,7 @@ class Settings @Inject constructor(@ApplicationContext private val context : Con
     var logCompact by sharedPreferences(context, false)
 
     // System
-    var operationMode by sharedPreferences(context, true)
+    var isDocked by sharedPreferences(context, true)
     var usernameValue by sharedPreferences(context, context.getString(R.string.username_default))
     var systemLanguage by sharedPreferences(context, 1)
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c2d27a7b..8bfada4f 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -66,7 +66,7 @@
             android:defaultValue="true"
             android:summaryOff="@string/handheld_enabled"
             android:summaryOn="@string/docked_enabled"
-            app:key="operation_mode"
+            app:key="is_docked"
             app:title="@string/use_docked" />
         <emu.skyline.preference.CustomEditTextPreference
             android:defaultValue="@string/username_default"