diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
index 867184d4da..680e85d61c 100644
--- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -26,7 +26,7 @@
 #include "Core/HW/WiimoteReal/IOWin.h"
 #include "Core/HW/WiimoteReal/IOdarwin.h"
 #include "Core/HW/WiimoteReal/IOhidapi.h"
-#include "InputCommon/ControllerInterface/Wiimote/Wiimote.h"
+#include "InputCommon/ControllerInterface/Wiimote/WiimoteController.h"
 #include "InputCommon/InputConfig.h"
 
 #include "SFML/Network.hpp"
@@ -85,7 +85,7 @@ static void TryToFillWiimoteSlot(u32 index)
   // If the pool is empty, attempt to steal from ControllerInterface.
   if (s_wiimote_pool.empty())
   {
-    ciface::Wiimote::ReleaseDevices(1);
+    ciface::WiimoteController::ReleaseDevices(1);
 
     // Still empty?
     if (s_wiimote_pool.empty())
@@ -108,13 +108,13 @@ void ProcessWiimotePool()
   if (SConfig::GetInstance().connect_wiimotes_for_ciface)
   {
     for (auto& entry : s_wiimote_pool)
-      ciface::Wiimote::AddDevice(std::move(entry.wiimote));
+      ciface::WiimoteController::AddDevice(std::move(entry.wiimote));
 
     s_wiimote_pool.clear();
   }
   else
   {
-    ciface::Wiimote::ReleaseDevices();
+    ciface::WiimoteController::ReleaseDevices();
   }
 }
 
@@ -858,7 +858,7 @@ void Shutdown()
     HandleWiimoteDisconnect(i);
 
   // Release remotes from ControllerInterface and empty the pool.
-  ciface::Wiimote::ReleaseDevices();
+  ciface::WiimoteController::ReleaseDevices();
   s_wiimote_pool.clear();
 }
 
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index e0b8664a06..fc955adfdf 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -56,8 +56,8 @@ add_library(inputcommon
   ControllerInterface/ControllerInterface.h
   ControllerInterface/Device.cpp
   ControllerInterface/Device.h
-  ControllerInterface/Wiimote/Wiimote.cpp
-  ControllerInterface/Wiimote/Wiimote.h
+  ControllerInterface/Wiimote/WiimoteController.cpp
+  ControllerInterface/Wiimote/WiimoteController.h
   ControlReference/ControlReference.cpp
   ControlReference/ControlReference.h
   ControlReference/ExpressionParser.cpp
diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
similarity index 99%
rename from Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp
rename to Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
index 2a11904550..eaa56ef449 100644
--- a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "InputCommon/ControllerInterface/Wiimote/Wiimote.h"
+#include "InputCommon/ControllerInterface/Wiimote/WiimoteController.h"
 
 #include "Common/BitUtils.h"
 #include "Common/Logging/Log.h"
@@ -13,7 +13,7 @@
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
-namespace ciface::Wiimote
+namespace ciface::WiimoteController
 {
 static constexpr char SOURCE_NAME[] = "Bluetooth";
 
@@ -1677,4 +1677,4 @@ void Device::ProcessStatusReport(const InputReportStatus& status)
   }
 }
 
-}  // namespace ciface::Wiimote
+}  // namespace ciface::WiimoteController
diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h
similarity index 99%
rename from Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h
rename to Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h
index 0dc9082af6..53abc0bf3f 100644
--- a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h
+++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h
@@ -18,7 +18,7 @@
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
-namespace ciface::Wiimote
+namespace ciface::WiimoteController
 {
 using namespace WiimoteCommon;
 
@@ -279,4 +279,4 @@ private:
   Clock::time_point m_last_report_time = Clock::now();
 };
 
-}  // namespace ciface::Wiimote
+}  // namespace ciface::WiimoteController
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj
index 8cd9f05963..142de4dddb 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ b/Source/Core/InputCommon/InputCommon.vcxproj
@@ -47,7 +47,7 @@
     <ClCompile Include="ControlReference\ExpressionParser.cpp" />
     <ClCompile Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.cpp" />
     <ClCompile Include="ControllerInterface\Win32\Win32.cpp" />
-    <ClCompile Include="ControllerInterface\Wiimote\Wiimote.cpp" />
+    <ClCompile Include="ControllerInterface\Wiimote\WiimoteController.cpp" />
     <ClCompile Include="ControllerInterface\XInput\XInput.cpp" />
     <ClCompile Include="ControlReference\FunctionExpression.cpp" />
     <ClCompile Include="DynamicInputTextureConfiguration.cpp" />
@@ -92,7 +92,7 @@
     <ClInclude Include="ControlReference\ExpressionParser.h" />
     <ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h" />
     <ClInclude Include="ControllerInterface\Win32\Win32.h" />
-    <ClInclude Include="ControllerInterface\Wiimote\Wiimote.h" />
+    <ClInclude Include="ControllerInterface\Wiimote\WiimoteController.h" />
     <ClInclude Include="ControllerInterface\XInput\XInput.h" />
     <ClInclude Include="DynamicInputTextureConfiguration.h" />
     <ClInclude Include="DynamicInputTextureManager.h" />
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
index 17f6cdf489..179b993455 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters
@@ -110,7 +110,7 @@
     <ClCompile Include="ControllerInterface\Win32\Win32.cpp">
       <Filter>ControllerInterface\Win32</Filter>
     </ClCompile>
-    <ClCompile Include="ControllerInterface\Wiimote\Wiimote.cpp">
+    <ClCompile Include="ControllerInterface\Wiimote\WiimoteController.cpp">
       <Filter>ControllerInterface\Wiimote</Filter>
     </ClCompile>
     <ClCompile Include="ControlReference\ExpressionParser.cpp">
@@ -223,7 +223,7 @@
     <ClInclude Include="ControllerInterface\Win32\Win32.h">
       <Filter>ControllerInterface\Win32</Filter>
     </ClInclude>
-    <ClInclude Include="ControllerInterface\Wiimote\Wiimote.h">
+    <ClInclude Include="ControllerInterface\Wiimote\WiimoteController.h">
       <Filter>ControllerInterface\Wiimote</Filter>
     </ClInclude>
     <ClInclude Include="ControlReference\ExpressionParser.h">