diff --git a/sourcepawn/jit/AMBuilder b/sourcepawn/jit/AMBuilder
index 7647d282..b00f2133 100644
--- a/sourcepawn/jit/AMBuilder
+++ b/sourcepawn/jit/AMBuilder
@@ -29,7 +29,7 @@ if binary.compiler.cc.behavior == 'msvc':
   binary.compiler.cxxflags.remove('/TP')
 
 binary.sources += [
-  'BaseRuntime.cpp',
+  'plugin-runtime.cpp',
   'compiled-function.cpp',
   'dll_exports.cpp',
   'engine2.cpp',
diff --git a/sourcepawn/jit/Makefile b/sourcepawn/jit/Makefile
index 0769fb38..c235ffbe 100644
--- a/sourcepawn/jit/Makefile
+++ b/sourcepawn/jit/Makefile
@@ -16,7 +16,7 @@ OBJECTS = dll_exports.cpp 	\
 	sp_vm_engine.cpp	\
 	scripted-invoker.cpp	\
 	engine2.cpp			\
-	BaseRuntime.cpp		\
+	plugin-runtime.cpp		\
 	opcodes.cpp		\
 	compiled-function.cpp	\
 	md5/md5.cpp			\
diff --git a/sourcepawn/jit/Makefile.shell b/sourcepawn/jit/Makefile.shell
index 54b0aa54..01564fde 100644
--- a/sourcepawn/jit/Makefile.shell
+++ b/sourcepawn/jit/Makefile.shell
@@ -16,7 +16,7 @@ OBJECTS = dll_exports.cpp 	\
 	sp_vm_engine.cpp	\
 	scripted-invoker.cpp	\
 	engine2.cpp			\
-	BaseRuntime.cpp		\
+	plugin-runtime.cpp		\
 	compiled-function.cpp	\
 	opcodes.cpp		\
 	watchdog_timer.cpp \
diff --git a/sourcepawn/jit/engine2.cpp b/sourcepawn/jit/engine2.cpp
index fc4bc6da..068ea0ef 100644
--- a/sourcepawn/jit/engine2.cpp
+++ b/sourcepawn/jit/engine2.cpp
@@ -16,7 +16,7 @@
 #include "engine2.h"
 #include "x86/jit_x86.h"
 #include "zlib/zlib.h"
-#include "BaseRuntime.h"
+#include "plugin-runtime.h"
 #include "sp_vm_engine.h"
 #include "watchdog_timer.h"
 #include <sourcemod_version.h>
diff --git a/sourcepawn/jit/interpreter.h b/sourcepawn/jit/interpreter.h
index 0e00b0a0..bc698b5a 100644
--- a/sourcepawn/jit/interpreter.h
+++ b/sourcepawn/jit/interpreter.h
@@ -19,7 +19,7 @@
 
 #include <sp_vm_types.h>
 #include <sp_vm_api.h>
-#include "BaseRuntime.h"
+#include "plugin-runtime.h"
 #include "sp_vm_basecontext.h"
 
 struct tracker_t
diff --git a/sourcepawn/jit/BaseRuntime.cpp b/sourcepawn/jit/plugin-runtime.cpp
similarity index 96%
rename from sourcepawn/jit/BaseRuntime.cpp
rename to sourcepawn/jit/plugin-runtime.cpp
index 97b8fd47..b460651d 100644
--- a/sourcepawn/jit/BaseRuntime.cpp
+++ b/sourcepawn/jit/plugin-runtime.cpp
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "BaseRuntime.h"
+#include "plugin-runtime.h"
 #include "sp_vm_engine.h"
 #include "x86/jit_x86.h"
 #include "sp_vm_basecontext.h"
diff --git a/sourcepawn/jit/BaseRuntime.h b/sourcepawn/jit/plugin-runtime.h
similarity index 100%
rename from sourcepawn/jit/BaseRuntime.h
rename to sourcepawn/jit/plugin-runtime.h
diff --git a/sourcepawn/jit/scripted-invoker.cpp b/sourcepawn/jit/scripted-invoker.cpp
index 1a50185c..bf02595c 100644
--- a/sourcepawn/jit/scripted-invoker.cpp
+++ b/sourcepawn/jit/scripted-invoker.cpp
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "scripted-invoker.h"
-#include "BaseRuntime.h"
+#include "plugin-runtime.h"
 
 /********************
 * FUNCTION CALLING *
diff --git a/sourcepawn/jit/sp_vm_basecontext.h b/sourcepawn/jit/sp_vm_basecontext.h
index 28656b5d..213e849c 100644
--- a/sourcepawn/jit/sp_vm_basecontext.h
+++ b/sourcepawn/jit/sp_vm_basecontext.h
@@ -15,7 +15,7 @@
 
 #include "sp_vm_api.h"
 #include "scripted-invoker.h"
-#include "BaseRuntime.h"
+#include "plugin-runtime.h"
 #include "jit_shared.h"
 
 /**
diff --git a/sourcepawn/jit/x86/jit_x86.cpp b/sourcepawn/jit/x86/jit_x86.cpp
index 9141187b..3fb4ff1d 100644
--- a/sourcepawn/jit/x86/jit_x86.cpp
+++ b/sourcepawn/jit/x86/jit_x86.cpp
@@ -35,7 +35,7 @@
 #include "jit_x86.h"
 #include "../sp_vm_engine.h"
 #include "../engine2.h"
-#include "../BaseRuntime.h"
+#include "../plugin-runtime.h"
 #include "../sp_vm_basecontext.h"
 #include "watchdog_timer.h"
 #include "interpreter.h"
diff --git a/sourcepawn/jit/x86/jit_x86.h b/sourcepawn/jit/x86/jit_x86.h
index 82f20f21..a93267c4 100644
--- a/sourcepawn/jit/x86/jit_x86.h
+++ b/sourcepawn/jit/x86/jit_x86.h
@@ -23,7 +23,7 @@
 #include <macro-assembler-x86.h>
 #include <am-vector.h>
 #include "jit_shared.h"
-#include "BaseRuntime.h"
+#include "plugin-runtime.h"
 #include "sp_vm_basecontext.h"
 #include "compiled-function.h"
 #include "opcodes.h"