diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt
index 583f1d9ab9..9663b55621 100644
--- a/UI/CMakeLists.txt
+++ b/UI/CMakeLists.txt
@@ -78,8 +78,8 @@ list(APPEND UISource
 	GamePacker.cpp
 	GameSettingsScreen.h
 	GameSettingsScreen.cpp
-	DeveloperToolsScreen.h
-	DeveloperToolsScreen.cpp
+	DeveloperSettingsPages.h
+	DeveloperSettingsPages.cpp
 	DriverManagerScreen.h
 	DriverManagerScreen.cpp
 	GPUDriverTestScreen.h
diff --git a/UI/DeveloperToolsScreen.cpp b/UI/DeveloperSettingsPages.cpp
similarity index 99%
rename from UI/DeveloperToolsScreen.cpp
rename to UI/DeveloperSettingsPages.cpp
index d6bfc3e426..8cbb1a33f9 100644
--- a/UI/DeveloperToolsScreen.cpp
+++ b/UI/DeveloperSettingsPages.cpp
@@ -41,7 +41,7 @@
 #include "Core/Util/PathUtil.h"
 #include "Core/FileSystems/VirtualDiscFileSystem.h"
 #include "UI/GPUDriverTestScreen.h"
-#include "UI/DeveloperToolsScreen.h"
+#include "UI/DeveloperSettingsPages.h"
 #include "UI/DevScreens.h"
 #include "UI/DriverManagerScreen.h"
 #include "UI/DisplayLayoutScreen.h"
diff --git a/UI/DeveloperToolsScreen.h b/UI/DeveloperSettingsPages.h
similarity index 100%
rename from UI/DeveloperToolsScreen.h
rename to UI/DeveloperSettingsPages.h
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 5b10483104..1c00ae7e99 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -50,7 +50,7 @@
 #include "UI/GamepadEmu.h"
 #include "UI/ControlMappingScreen.h"
 #include "UI/DevScreens.h"
-#include "UI/DeveloperToolsScreen.h"
+#include "UI/DeveloperSettingsPages.h"
 #include "UI/DisplayLayoutScreen.h"
 #include "UI/FirmwareScreen.h"
 #include "UI/RemoteISOScreen.h"
diff --git a/UI/Settings/ToolsPage.cpp b/UI/Settings/ToolsPage.cpp
index b59f61957c..951fea7485 100644
--- a/UI/Settings/ToolsPage.cpp
+++ b/UI/Settings/ToolsPage.cpp
@@ -19,7 +19,7 @@
 #include "Common/System/System.h"
 #include "Common/UI/ScreenManager.h"
 #include "Common/UI/View.h"
-#include "UI/DeveloperToolsScreen.h"
+#include "UI/DeveloperSettingsPages.h"
 #include "UI/FirmwareScreen.h"
 #include "UI/RemoteISOScreen.h"
 #include "UI/RetroAchievementScreens.h"
diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj
index 3c5f274ca6..b9d6247c44 100644
--- a/UI/UI.vcxproj
+++ b/UI/UI.vcxproj
@@ -36,7 +36,7 @@
     <ClCompile Include="CustomButtonMappingScreen.cpp" />
     <ClCompile Include="CwCheatScreen.cpp" />
     <ClCompile Include="DebugOverlay.cpp" />
-    <ClCompile Include="DeveloperToolsScreen.cpp" />
+    <ClCompile Include="DeveloperSettingsPages.cpp" />
     <ClCompile Include="DevScreens.cpp" />
     <ClCompile Include="DiscordIntegration.cpp" />
     <ClCompile Include="DisplayLayoutScreen.cpp" />
@@ -107,7 +107,7 @@
     <ClInclude Include="ControlMappingScreen.h" />
     <ClInclude Include="CustomButtonMappingScreen.h" />
     <ClInclude Include="DebugOverlay.h" />
-    <ClInclude Include="DeveloperToolsScreen.h" />
+    <ClInclude Include="DeveloperSettingsPages.h" />
     <ClInclude Include="DevScreens.h" />
     <ClInclude Include="DiscordIntegration.h" />
     <ClInclude Include="DisplayLayoutScreen.h" />
diff --git a/UI/UI.vcxproj.filters b/UI/UI.vcxproj.filters
index 615dfff21f..e79229eb59 100644
--- a/UI/UI.vcxproj.filters
+++ b/UI/UI.vcxproj.filters
@@ -159,7 +159,7 @@
     <ClCompile Include="ImDebugger\ImConsole.cpp">
       <Filter>ImDebugger</Filter>
     </ClCompile>
-    <ClCompile Include="DeveloperToolsScreen.cpp">
+    <ClCompile Include="DeveloperSettingsPages.cpp">
       <Filter>Screens</Filter>
     </ClCompile>
     <ClCompile Include="UIAtlas.cpp" />
@@ -329,7 +329,7 @@
     <ClInclude Include="ImDebugger\ImConsole.h">
       <Filter>ImDebugger</Filter>
     </ClInclude>
-    <ClInclude Include="DeveloperToolsScreen.h">
+    <ClInclude Include="DeveloperSettingsPages.h">
       <Filter>Screens</Filter>
     </ClInclude>
     <ClInclude Include="UIAtlas.h" />
diff --git a/UWP/UI_UWP/UI_UWP.vcxproj b/UWP/UI_UWP/UI_UWP.vcxproj
index fd862458ef..b1e306cead 100644
--- a/UWP/UI_UWP/UI_UWP.vcxproj
+++ b/UWP/UI_UWP/UI_UWP.vcxproj
@@ -95,7 +95,7 @@
     <ClInclude Include="..\..\UI\CustomButtonMappingScreen.h" />
     <ClInclude Include="..\..\UI\CwCheatScreen.h" />
     <ClInclude Include="..\..\UI\DebugOverlay.h" />
-    <ClInclude Include="..\..\UI\DeveloperToolsScreen.h" />
+    <ClInclude Include="..\..\UI\DeveloperSettingsPages.h" />
     <ClInclude Include="..\..\UI\DevScreens.h" />
     <ClInclude Include="..\..\UI\DiscordIntegration.h" />
     <ClInclude Include="..\..\UI\DisplayLayoutScreen.h" />
@@ -161,7 +161,7 @@
     <ClCompile Include="..\..\UI\CustomButtonMappingScreen.cpp" />
     <ClCompile Include="..\..\UI\CwCheatScreen.cpp" />
     <ClCompile Include="..\..\UI\DebugOverlay.cpp" />
-    <ClCompile Include="..\..\UI\DeveloperToolsScreen.cpp" />
+    <ClCompile Include="..\..\UI\DeveloperSettingsPages.cpp" />
     <ClCompile Include="..\..\UI\DevScreens.cpp" />
     <ClCompile Include="..\..\UI\DiscordIntegration.cpp" />
     <ClCompile Include="..\..\UI\DisplayLayoutScreen.cpp" />
diff --git a/UWP/UI_UWP/UI_UWP.vcxproj.filters b/UWP/UI_UWP/UI_UWP.vcxproj.filters
index 627dd50bab..43ce18d962 100644
--- a/UWP/UI_UWP/UI_UWP.vcxproj.filters
+++ b/UWP/UI_UWP/UI_UWP.vcxproj.filters
@@ -47,7 +47,7 @@
     <ClCompile Include="..\..\UI\CwCheatScreen.cpp">
       <Filter>Screens</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\UI\DeveloperToolsScreen.cpp">
+    <ClCompile Include="..\..\UI\DeveloperSettingsPages.cpp">
       <Filter>Screens</Filter>
     </ClCompile>
     <ClCompile Include="..\..\UI\DevScreens.cpp">
@@ -227,7 +227,7 @@
     <ClInclude Include="..\..\UI\CwCheatScreen.h">
       <Filter>Screens</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\UI\DeveloperToolsScreen.h">
+    <ClInclude Include="..\..\UI\DeveloperSettingsPages.h">
       <Filter>Screens</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\DevScreens.h">
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 40225038a5..b5eae5ad78 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -1054,7 +1054,7 @@ LOCAL_SRC_FILES := \
   $(SRC)/UI/UploadScreen.cpp \
   $(SRC)/UI/ControlMappingScreen.cpp \
   $(SRC)/UI/GameSettingsScreen.cpp \
-  $(SRC)/UI/DeveloperToolsScreen.cpp \
+  $(SRC)/UI/DeveloperSettingsPages.cpp \
   $(SRC)/UI/GPUDriverTestScreen.cpp \
   $(SRC)/UI/TiltAnalogSettingsScreen.cpp \
   $(SRC)/UI/TouchControlLayoutScreen.cpp \
diff --git a/docs/WebSocketDebugger.md b/docs/WebSocketDebugger.md
index 6f9f9cae0e..8636984274 100644
--- a/docs/WebSocketDebugger.md
+++ b/docs/WebSocketDebugger.md
@@ -294,7 +294,7 @@ file - this is just an index.
 ## Enabling it
 
 - **UI**: Settings > Tools > Developer Tools > "Allow remote debugger"
-  checkbox (`UI/DeveloperToolsScreen.cpp`). The "Local Server Port" slider on
+  checkbox (`UI/DeveloperSettingsPages.cpp`). The "Local Server Port" slider on
   the Networking screen sets the port (shared with Remote ISO sharing; `0` =
   auto-pick).
 - **Config**: `RemoteDebuggerOnStartup=true` in `ppsspp.ini`