diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index ea436b1054..741433525d 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -618,10 +618,10 @@ add_library(Core STATIC
 	MIPS/MIPSDis.h
 	MIPS/MIPSDisVFPU.cpp
 	MIPS/MIPSDisVFPU.h
-	MIPS/MIPSInt.cpp
-	MIPS/MIPSInt.h
-	MIPS/MIPSIntVFPU.cpp
-	MIPS/MIPSIntVFPU.h
+	MIPS/Interpreter.cpp
+	MIPS/Interpreter.h
+	MIPS/InterpreterVFPU.cpp
+	MIPS/InterpreterVFPU.h
 	MIPS/MIPSStackWalk.cpp
 	MIPS/MIPSStackWalk.h
 	MIPS/MIPSTables.cpp
diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
index 4897269e84..64029d6e22 100644
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@@ -844,8 +844,8 @@
     <ClCompile Include="MIPS\MIPSDebugInterface.cpp" />
     <ClCompile Include="MIPS\MIPSDis.cpp" />
     <ClCompile Include="MIPS\MIPSDisVFPU.cpp" />
-    <ClCompile Include="MIPS\MIPSInt.cpp" />
-    <ClCompile Include="MIPS\MIPSIntVFPU.cpp" />
+    <ClCompile Include="MIPS\Interpreter.cpp" />
+    <ClCompile Include="MIPS\InterpreterVFPU.cpp" />
     <ClCompile Include="MIPS\MIPSTables.cpp" />
     <ClCompile Include="MIPS\MIPSVFPUUtils.cpp" />
     <ClCompile Include="MIPS\MIPSTracer.cpp" />
@@ -1229,8 +1229,8 @@
     <ClInclude Include="MIPS\MIPSDebugInterface.h" />
     <ClInclude Include="MIPS\MIPSDis.h" />
     <ClInclude Include="MIPS\MIPSDisVFPU.h" />
-    <ClInclude Include="MIPS\MIPSInt.h" />
-    <ClInclude Include="MIPS\MIPSIntVFPU.h" />
+    <ClInclude Include="MIPS\Interpreter.h" />
+    <ClInclude Include="MIPS\InterpreterVFPU.h" />
     <ClInclude Include="MIPS\MIPSTables.h" />
     <ClInclude Include="MIPS\MIPSVFPUUtils.h" />
     <ClInclude Include="MIPS\MIPSTracer.h" />
diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters
index 9cc881974b..05e8c474cc 100644
--- a/Core/Core.vcxproj.filters
+++ b/Core/Core.vcxproj.filters
@@ -111,10 +111,10 @@
     <ClCompile Include="MIPS\MIPSDisVFPU.cpp">
       <Filter>MIPS</Filter>
     </ClCompile>
-    <ClCompile Include="MIPS\MIPSInt.cpp">
+    <ClCompile Include="MIPS\Interpreter.cpp">
       <Filter>MIPS</Filter>
     </ClCompile>
-    <ClCompile Include="MIPS\MIPSIntVFPU.cpp">
+    <ClCompile Include="MIPS\InterpreterVFPU.cpp">
       <Filter>MIPS</Filter>
     </ClCompile>
     <ClCompile Include="MIPS\MIPSTables.cpp">
@@ -1416,10 +1416,10 @@
     <ClInclude Include="MIPS\MIPSDisVFPU.h">
       <Filter>MIPS</Filter>
     </ClInclude>
-    <ClInclude Include="MIPS\MIPSInt.h">
+    <ClInclude Include="MIPS\Interpreter.h">
       <Filter>MIPS</Filter>
     </ClInclude>
-    <ClInclude Include="MIPS\MIPSIntVFPU.h">
+    <ClInclude Include="MIPS\InterpreterVFPU.h">
       <Filter>MIPS</Filter>
     </ClInclude>
     <ClInclude Include="MIPS\MIPSTables.h">
diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp
index ac42b62e40..8b4dd79e70 100644
--- a/Core/HLE/sceKernel.cpp
+++ b/Core/HLE/sceKernel.cpp
@@ -28,7 +28,7 @@
 #include "Core/HLE/ErrorCodes.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
-#include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/Interpreter.h"
 #include "Core/MIPS/JitCommon/JitCommon.h"
 
 #include "Core/FileSystems/FileSystem.h"
diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp
index 2940957932..3663ec9c0c 100644
--- a/Core/MIPS/ARM/ArmJit.cpp
+++ b/Core/MIPS/ARM/ArmJit.cpp
@@ -35,7 +35,7 @@
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
-#include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/Interpreter.h"
 #include "Core/MIPS/MIPSTables.h"
 #include "Core/HLE/ReplaceTables.h"
 #include "Core/MIPS/ARM/ArmRegCache.h"
diff --git a/Core/MIPS/ARM64/Arm64Jit.cpp b/Core/MIPS/ARM64/Arm64Jit.cpp
index 4b152d28c8..8dcdbb562d 100644
--- a/Core/MIPS/ARM64/Arm64Jit.cpp
+++ b/Core/MIPS/ARM64/Arm64Jit.cpp
@@ -37,7 +37,7 @@
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
-#include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/Interpreter.h"
 #include "Core/MIPS/MIPSTables.h"
 #include "Core/HLE/ReplaceTables.h"
 #include "Core/MIPS/ARM64/Arm64RegCache.h"
diff --git a/Core/MIPS/IR/IRJit.cpp b/Core/MIPS/IR/IRJit.cpp
index db179d1b97..60fba057e5 100644
--- a/Core/MIPS/IR/IRJit.cpp
+++ b/Core/MIPS/IR/IRJit.cpp
@@ -33,7 +33,7 @@
 #include "Core/MemMap.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
-#include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/Interpreter.h"
 #include "Core/MIPS/MIPSTables.h"
 #include "Core/MIPS/IR/IRRegCache.h"
 #include "Core/MIPS/IR/IRInterpreter.h"
diff --git a/Core/MIPS/MIPSInt.cpp b/Core/MIPS/Interpreter.cpp
similarity index 99%
rename from Core/MIPS/MIPSInt.cpp
rename to Core/MIPS/Interpreter.cpp
index 98f20874c3..b383e01a0c 100644
--- a/Core/MIPS/MIPSInt.cpp
+++ b/Core/MIPS/Interpreter.cpp
@@ -28,7 +28,7 @@
 #include "Core/MemMap.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
-#include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/Interpreter.h"
 #include "Core/MIPS/MIPSTables.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
diff --git a/Core/MIPS/MIPSInt.h b/Core/MIPS/Interpreter.h
similarity index 100%
rename from Core/MIPS/MIPSInt.h
rename to Core/MIPS/Interpreter.h
diff --git a/Core/MIPS/MIPSIntVFPU.cpp b/Core/MIPS/InterpreterVFPU.cpp
similarity index 99%
rename from Core/MIPS/MIPSIntVFPU.cpp
rename to Core/MIPS/InterpreterVFPU.cpp
index ca32f9f436..71c673f311 100644
--- a/Core/MIPS/MIPSIntVFPU.cpp
+++ b/Core/MIPS/InterpreterVFPU.cpp
@@ -31,7 +31,7 @@
 #include "Core/System.h"
 
 #include "Core/MIPS/MIPS.h"
-#include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/Interpreter.h"
 #include "Core/MIPS/MIPSTables.h"
 #include "Core/MIPS/MIPSVFPUUtils.h"
 
diff --git a/Core/MIPS/MIPSIntVFPU.h b/Core/MIPS/InterpreterVFPU.h
similarity index 100%
rename from Core/MIPS/MIPSIntVFPU.h
rename to Core/MIPS/InterpreterVFPU.h
diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp
index 4335c45e59..99b2d283c9 100644
--- a/Core/MIPS/MIPS.cpp
+++ b/Core/MIPS/MIPS.cpp
@@ -26,7 +26,7 @@
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/ConfigValues.h"
 #include "Core/MIPS/MIPS.h"
-#include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/Interpreter.h"
 #include "Core/MIPS/MIPSTables.h"
 #include "Core/MIPS/MIPSDebugInterface.h"
 #include "Core/MIPS/MIPSVFPUUtils.h"
diff --git a/Core/MIPS/MIPSTables.cpp b/Core/MIPS/MIPSTables.cpp
index fa797d3be6..fb717fb219 100644
--- a/Core/MIPS/MIPSTables.cpp
+++ b/Core/MIPS/MIPSTables.cpp
@@ -22,8 +22,8 @@
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSDis.h"
 #include "Core/MIPS/MIPSDisVFPU.h"
-#include "Core/MIPS/MIPSInt.h"
-#include "Core/MIPS/MIPSIntVFPU.h"
+#include "Core/MIPS/Interpreter.h"
+#include "Core/MIPS/InterpreterVFPU.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/MIPSTables.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/MIPS/fake/FakeJit.cpp b/Core/MIPS/fake/FakeJit.cpp
index a9df164c23..111046fd17 100644
--- a/Core/MIPS/fake/FakeJit.cpp
+++ b/Core/MIPS/fake/FakeJit.cpp
@@ -26,7 +26,7 @@
 #include "Core/MemMap.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
-#include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/Interpreter.h"
 #include "Core/MIPS/MIPSTables.h"
 #include "Core/HLE/ReplaceTables.h"
 
diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp
index 6fddefdc98..68f4986340 100644
--- a/Core/MIPS/x86/Jit.cpp
+++ b/Core/MIPS/x86/Jit.cpp
@@ -36,7 +36,7 @@
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
-#include "Core/MIPS/MIPSInt.h"
+#include "Core/MIPS/Interpreter.h"
 #include "Core/MIPS/MIPSTables.h"
 #include "Core/HLE/ReplaceTables.h"
 
diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj
index 8c249501e0..26906915f2 100644
--- a/UWP/CoreUWP/CoreUWP.vcxproj
+++ b/UWP/CoreUWP/CoreUWP.vcxproj
@@ -290,8 +290,8 @@
     <ClInclude Include="..\..\Core\MIPS\MIPSDebugInterface.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSDis.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSDisVFPU.h" />
-    <ClInclude Include="..\..\Core\MIPS\MIPSInt.h" />
-    <ClInclude Include="..\..\Core\MIPS\MIPSIntVFPU.h" />
+    <ClInclude Include="..\..\Core\MIPS\Interpreter.h" />
+    <ClInclude Include="..\..\Core\MIPS\InterpreterVFPU.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSStackWalk.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSTables.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSVFPUFallbacks.h" />
@@ -586,8 +586,8 @@
     <ClCompile Include="..\..\Core\MIPS\MIPSDebugInterface.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSDis.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSDisVFPU.cpp" />
-    <ClCompile Include="..\..\Core\MIPS\MIPSInt.cpp" />
-    <ClCompile Include="..\..\Core\MIPS\MIPSIntVFPU.cpp" />
+    <ClCompile Include="..\..\Core\MIPS\Interpreter.cpp" />
+    <ClCompile Include="..\..\Core\MIPS\InterpreterVFPU.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSStackWalk.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSTables.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSVFPUFallbacks.cpp" />
diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters
index 6bcf00da54..1aee00a9b4 100644
--- a/UWP/CoreUWP/CoreUWP.vcxproj.filters
+++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters
@@ -225,8 +225,8 @@
     <ClCompile Include="..\..\Core\MIPS\MIPSDebugInterface.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSDis.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSDisVFPU.cpp" />
-    <ClCompile Include="..\..\Core\MIPS\MIPSInt.cpp" />
-    <ClCompile Include="..\..\Core\MIPS\MIPSIntVFPU.cpp" />
+    <ClCompile Include="..\..\Core\MIPS\Interpreter.cpp" />
+    <ClCompile Include="..\..\Core\MIPS\InterpreterVFPU.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSStackWalk.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSTables.cpp" />
     <ClCompile Include="..\..\Core\MIPS\MIPSVFPUFallbacks.cpp" />
@@ -618,8 +618,8 @@
     <ClInclude Include="..\..\Core\MIPS\MIPSDebugInterface.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSDis.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSDisVFPU.h" />
-    <ClInclude Include="..\..\Core\MIPS\MIPSInt.h" />
-    <ClInclude Include="..\..\Core\MIPS\MIPSIntVFPU.h" />
+    <ClInclude Include="..\..\Core\MIPS\Interpreter.h" />
+    <ClInclude Include="..\..\Core\MIPS\InterpreterVFPU.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSStackWalk.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSTables.h" />
     <ClInclude Include="..\..\Core\MIPS\MIPSVFPUFallbacks.h" />
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 0a058f5f2c..fb965d406a 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -514,8 +514,8 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Core/MIPS/MIPSDis.cpp \
   $(SRC)/Core/MIPS/MIPSDisVFPU.cpp \
   $(SRC)/Core/MIPS/MIPSAsm.cpp \
-  $(SRC)/Core/MIPS/MIPSInt.cpp.arm \
-  $(SRC)/Core/MIPS/MIPSIntVFPU.cpp.arm \
+  $(SRC)/Core/MIPS/Interpreter.cpp.arm \
+  $(SRC)/Core/MIPS/InterpreterVFPU.cpp.arm \
   $(SRC)/Core/MIPS/MIPSStackWalk.cpp \
   $(SRC)/Core/MIPS/MIPSTables.cpp \
   $(SRC)/Core/MIPS/MIPSVFPUUtils.cpp.arm \
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 0d3c79180e..410150a68e 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -871,8 +871,8 @@ SOURCES_CXX += \
 	       $(COREDIR)/MIPS/MIPSDebugInterface.cpp \
 	       $(COREDIR)/MIPS/MIPSDis.cpp \
 	       $(COREDIR)/MIPS/MIPSDisVFPU.cpp \
-	       $(COREDIR)/MIPS/MIPSInt.cpp \
-	       $(COREDIR)/MIPS/MIPSIntVFPU.cpp \
+	       $(COREDIR)/MIPS/Interpreter.cpp \
+	       $(COREDIR)/MIPS/InterpreterVFPU.cpp \
 	       $(COREDIR)/MIPS/MIPSTables.cpp \
 	       $(COREDIR)/MIPS/MIPSStackWalk.cpp \
 	       $(COREDIR)/MIPS/MIPSVFPUUtils.cpp \