diff --git a/src/RageInput.cpp b/src/RageInput.cpp
index b63681449e..05d4d6e221 100644
--- a/src/RageInput.cpp
+++ b/src/RageInput.cpp
@@ -12,7 +12,7 @@
 RageInput* INPUTMAN = nullptr; // global and accessible from anywhere in our program
 
 Preference<RString> g_sInputDrivers( "InputDrivers", "" ); // "" == DEFAULT_INPUT_DRIVER_LIST
-Preference<RString> g_sInputLinuxJoysticks( "InputLinuxJoysticks", "" ); // "" == DEFAULT_LINUX_INPUT_JOYSTICK_LIST
+Preference<RString> g_sInputDeviceOrder( "InputDeviceOrder", "" ); // "" == DEFAULT_LINUX_INPUT_DEVICE_ORDER_LIST
 
 namespace
 {
diff --git a/src/RageInput.h b/src/RageInput.h
index fa5fbbcf1d..c8da763ae3 100644
--- a/src/RageInput.h
+++ b/src/RageInput.h
@@ -36,7 +36,7 @@ public:
 };
 
 extern Preference<RString> g_sInputDrivers;
-extern Preference<RString> g_sInputLinuxJoysticks;
+extern Preference<RString> g_sInputDeviceOrder;
 
 extern RageInput*			INPUTMAN;	// global and accessible from anywhere in our program
 
diff --git a/src/arch/InputHandler/LinuxInputManager.cpp b/src/arch/InputHandler/LinuxInputManager.cpp
index 7e6a0d3c52..2655dfe7fb 100644
--- a/src/arch/InputHandler/LinuxInputManager.cpp
+++ b/src/arch/InputHandler/LinuxInputManager.cpp
@@ -3,7 +3,7 @@
 #include "InputHandler_Linux_Event.h"
 #include "InputHandler_Linux_Joystick.h"
 
-#include "RageInput.h" // g_sInputDrivers g_sInputLinuxJoysticks
+#include "RageInput.h" // g_sInputDrivers g_sInputDeviceOrder
 #include "RageLog.h"
 
 #include <string> // std::string::npos
@@ -106,8 +106,8 @@ void LinuxInputManager::InitDriver(InputHandler_Linux_Joystick* driver)
 {
 	m_JoystickDriver = driver;
 	// Discard all the joystick devices if they were assigned manually via 
-	// 	LinuxInputJoysticks
-	if( g_sInputLinuxJoysticks.Get() != "" ) {
+	// 	InputDeviceOrder
+	if( g_sInputDeviceOrder.Get() != "" ) {
 		m_vsPendingJoystickDevices.clear();
 	}
 
@@ -119,9 +119,9 @@ void LinuxInputManager::InitDriver(InputHandler_Linux_Joystick* driver)
 		driver->TryDevice(devFile);
 	}
 
-	// If any, add the manually specified devices via LinuxInputJoysticks
+	// If any, add the manually specified devices via InputDeviceOrder
 	std::vector<RString> fixedDevices;
-	split( g_sInputLinuxJoysticks, ",", fixedDevices, true );
+	split( g_sInputDeviceOrder, ",", fixedDevices, true );
 
 	for (RString dev : fixedDevices) {
 		RString devFile = dev;