diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp
index 14f5cb23d911..d4d114a350b7 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp
@@ -50,7 +50,7 @@ Device::Input* Device::FindInput(const std::string& name) const
 {
   for (Input* input : m_inputs)
   {
-    if (input->GetName() == name)
+    if (input->IsValidName(name))
       return input;
   }
 
@@ -61,18 +61,42 @@ Device::Output* Device::FindOutput(const std::string& name) const
 {
   for (Output* output : m_outputs)
   {
-    if (output->GetName() == name)
+    if (output->IsValidName(name))
       return output;
   }
 
   return nullptr;
 }
 
+bool Device::Control::IsValidName(const std::string& name) const
+{
+  return GetName() == name;
+}
+
 ControlState Device::FullAnalogSurface::GetState() const
 {
   return (1 + std::max(0.0, m_high.GetState()) - std::max(0.0, m_low.GetState())) / 2;
 }
 
+std::string Device::FullAnalogSurface::GetName() const
+{
+  // E.g. "Full Axis X+"
+  return "Full " + m_high.GetName();
+}
+
+bool Device::FullAnalogSurface::IsValidName(const std::string& name) const
+{
+  if (Control::IsValidName(name))
+    return true;
+
+  // Old naming scheme was "Axis X-+" which is too visually similar to "Axis X+".
+  // This has caused countless problems for users with mysterious misconfigurations.
+  // We match this old name to support old configurations.
+  const auto old_name = m_low.GetName() + *m_high.GetName().rbegin();
+
+  return old_name == name;
+}
+
 //
 // DeviceQualifier :: ToString
 //
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h
index 7d7623ba0311..a99ae1fa2721 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.h
+++ b/Source/Core/InputCommon/ControllerInterface/Device.h
@@ -45,6 +45,10 @@ class Device
     virtual ~Control() {}
     virtual Input* ToInput() { return nullptr; }
     virtual Output* ToOutput() { return nullptr; }
+
+    // May be overridden to allow multiple valid names.
+    // Useful for backwards-compatible configurations when names change.
+    virtual bool IsValidName(const std::string& name) const;
   };
 
   //
@@ -105,12 +109,13 @@ class Device
   void AddInput(Input* const i);
   void AddOutput(Output* const o);
 
-  class FullAnalogSurface : public Input
+  class FullAnalogSurface final : public Input
   {
   public:
     FullAnalogSurface(Input* low, Input* high) : m_low(*low), m_high(*high) {}
     ControlState GetState() const override;
-    std::string GetName() const override { return m_low.GetName() + *m_high.GetName().rbegin(); }
+    std::string GetName() const override;
+    bool IsValidName(const std::string& name) const override;
 
   private:
     Input& m_low;