diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9001f35f1..ff2c70af5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2411,8 +2411,8 @@ set(NativeAssets
 if(HEADLESS)
 	set(HeadlessSource
 		headless/Headless.cpp
-		headless/StubHost.cpp
-		headless/StubHost.h
+		headless/HeadlessHost.cpp
+		headless/HeadlessHost.h
 		headless/Compare.cpp
 		headless/Compare.h
 		headless/SDLHeadlessHost.cpp
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 38ebb7989b..23f1f5220b 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -763,7 +763,7 @@ ifeq ($(HEADLESS),1)
   LOCAL_MODULE := ppsspp_headless
   LOCAL_SRC_FILES := \
     $(SRC)/headless/Headless.cpp \
-    $(SRC)/headless/StubHost.cpp \
+    $(SRC)/headless/HeadlessHost.cpp \
     $(SRC)/headless/Compare.cpp
 
   include $(BUILD_EXECUTABLE)
diff --git a/headless/Headless.cpp b/headless/Headless.cpp
index 1df2759e08..2650272f9b 100644
--- a/headless/Headless.cpp
+++ b/headless/Headless.cpp
@@ -44,7 +44,7 @@
 #include "LogManager.h"
 
 #include "Compare.h"
-#include "StubHost.h"
+#include "HeadlessHost.h"
 #if defined(_WIN32)
 #include "WindowsHeadlessHost.h"
 #elif defined(SDL)
diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj
index 6ef86ce3ee..ed551d84f2 100644
--- a/headless/Headless.vcxproj
+++ b/headless/Headless.vcxproj
@@ -477,7 +477,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="StubHost.cpp" />
+    <ClCompile Include="HeadlessHost.cpp" />
     <ClCompile Include="WindowsHeadlessHost.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -510,7 +510,7 @@
   <ItemGroup>
     <ClInclude Include="Compare.h" />
     <ClInclude Include="SDLHeadlessHost.h" />
-    <ClInclude Include="StubHost.h" />
+    <ClInclude Include="HeadlessHost.h" />
     <ClInclude Include="WindowsHeadlessHost.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/headless/Headless.vcxproj.filters b/headless/Headless.vcxproj.filters
index f084554e71..0cc2cc7b61 100644
--- a/headless/Headless.vcxproj.filters
+++ b/headless/Headless.vcxproj.filters
@@ -22,20 +22,19 @@
     <ClCompile Include="..\Windows\GPU\D3D11Context.cpp">
       <Filter>Windows</Filter>
     </ClCompile>
-    <ClCompile Include="StubHost.cpp" />
     <ClCompile Include="SDLHeadlessHost.cpp">
       <Filter>Other Platforms</Filter>
     </ClCompile>
     <ClCompile Include="..\Windows\CaptureDevice.cpp">
       <Filter>Windows</Filter>
     </ClCompile>
+    <ClCompile Include="HeadlessHost.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="headless.txt" />
     <None Include="..\test.py" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="StubHost.h" />
     <ClInclude Include="Compare.h" />
     <ClInclude Include="WindowsHeadlessHost.h">
       <Filter>Windows</Filter>
@@ -43,6 +42,7 @@
     <ClInclude Include="SDLHeadlessHost.h">
       <Filter>Other Platforms</Filter>
     </ClInclude>
+    <ClInclude Include="HeadlessHost.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Windows">
diff --git a/headless/StubHost.cpp b/headless/HeadlessHost.cpp
similarity index 98%
rename from headless/StubHost.cpp
rename to headless/HeadlessHost.cpp
index 03a27ab1bf..a18fd63abf 100644
--- a/headless/StubHost.cpp
+++ b/headless/HeadlessHost.cpp
@@ -22,7 +22,7 @@
 #include "Core/System.h"
 #include "GPU/Common/GPUDebugInterface.h"
 #include "headless/Compare.h"
-#include "headless/StubHost.h"
+#include "headless/HeadlessHost.h"
 
 void HeadlessHost::SendOrCollectDebugOutput(const std::string &data)
 {
diff --git a/headless/StubHost.h b/headless/HeadlessHost.h
similarity index 100%
rename from headless/StubHost.h
rename to headless/HeadlessHost.h
diff --git a/headless/SDLHeadlessHost.h b/headless/SDLHeadlessHost.h
index afcac2e2ac..413223e2c4 100644
--- a/headless/SDLHeadlessHost.h
+++ b/headless/SDLHeadlessHost.h
@@ -19,7 +19,7 @@
 
 #ifdef SDL
 
-#include "headless/StubHost.h"
+#include "headless/HeadlessHost.h"
 
 #undef HEADLESSHOST_CLASS
 #define HEADLESSHOST_CLASS SDLHeadlessHost
diff --git a/headless/WindowsHeadlessHost.h b/headless/WindowsHeadlessHost.h
index 3b67fee26a..daa380b74d 100644
--- a/headless/WindowsHeadlessHost.h
+++ b/headless/WindowsHeadlessHost.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "headless/StubHost.h"
+#include "headless/HeadlessHost.h"
 #include <thread>
 
 #undef HEADLESSHOST_CLASS