diff --git a/sourcepawn/jit/AMBuilder b/sourcepawn/jit/AMBuilder
index d74a92ca..7647d282 100644
--- a/sourcepawn/jit/AMBuilder
+++ b/sourcepawn/jit/AMBuilder
@@ -35,7 +35,7 @@ binary.sources += [
   'engine2.cpp',
   'sp_vm_basecontext.cpp',
   'sp_vm_engine.cpp',
-  'sp_vm_function.cpp',
+  'scripted-invoker.cpp',
   'opcodes.cpp',
   'interpreter.cpp',
   'watchdog_timer.cpp',
diff --git a/sourcepawn/jit/BaseRuntime.h b/sourcepawn/jit/BaseRuntime.h
index 47029e47..2da98b9a 100644
--- a/sourcepawn/jit/BaseRuntime.h
+++ b/sourcepawn/jit/BaseRuntime.h
@@ -7,7 +7,7 @@
 #include <am-inlinelist.h>
 #include "jit_shared.h"
 #include "compiled-function.h"
-#include "sp_vm_function.h"
+#include "scripted-invoker.h"
 
 class BaseContext;
 
diff --git a/sourcepawn/jit/Makefile b/sourcepawn/jit/Makefile
index ef84fc5b..0769fb38 100644
--- a/sourcepawn/jit/Makefile
+++ b/sourcepawn/jit/Makefile
@@ -14,7 +14,7 @@ OBJECTS = dll_exports.cpp 	\
 	x86/jit_x86.cpp			\
 	sp_vm_basecontext.cpp	\
 	sp_vm_engine.cpp	\
-	sp_vm_function.cpp	\
+	scripted-invoker.cpp	\
 	engine2.cpp			\
 	BaseRuntime.cpp		\
 	opcodes.cpp		\
diff --git a/sourcepawn/jit/Makefile.shell b/sourcepawn/jit/Makefile.shell
index 6df0ce2d..54b0aa54 100644
--- a/sourcepawn/jit/Makefile.shell
+++ b/sourcepawn/jit/Makefile.shell
@@ -14,7 +14,7 @@ OBJECTS = dll_exports.cpp 	\
 	x86/jit_x86.cpp			\
 	sp_vm_basecontext.cpp	\
 	sp_vm_engine.cpp	\
-	sp_vm_function.cpp	\
+	scripted-invoker.cpp	\
 	engine2.cpp			\
 	BaseRuntime.cpp		\
 	compiled-function.cpp	\
diff --git a/sourcepawn/jit/sp_vm_function.cpp b/sourcepawn/jit/scripted-invoker.cpp
similarity index 95%
rename from sourcepawn/jit/sp_vm_function.cpp
rename to sourcepawn/jit/scripted-invoker.cpp
index 354065fb..cd329acf 100644
--- a/sourcepawn/jit/sp_vm_function.cpp
+++ b/sourcepawn/jit/scripted-invoker.cpp
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "sp_vm_function.h"
+#include "scripted-invoker.h"
 #include "BaseRuntime.h"
 
 /********************
diff --git a/sourcepawn/jit/sp_vm_function.h b/sourcepawn/jit/scripted-invoker.h
similarity index 100%
rename from sourcepawn/jit/sp_vm_function.h
rename to sourcepawn/jit/scripted-invoker.h
diff --git a/sourcepawn/jit/sp_vm_basecontext.h b/sourcepawn/jit/sp_vm_basecontext.h
index 7eb1e990..fb5fdbd1 100644
--- a/sourcepawn/jit/sp_vm_basecontext.h
+++ b/sourcepawn/jit/sp_vm_basecontext.h
@@ -14,7 +14,7 @@
 #define _INCLUDE_SOURCEPAWN_BASECONTEXT_H_
 
 #include "sp_vm_api.h"
-#include "sp_vm_function.h"
+#include "scripted-invoker.h"
 #include "BaseRuntime.h"
 #include "jit_shared.h"
 
diff --git a/sourcepawn/jit/sp_vm_engine.h b/sourcepawn/jit/sp_vm_engine.h
index 2957f8dc..3260bd2b 100644
--- a/sourcepawn/jit/sp_vm_engine.h
+++ b/sourcepawn/jit/sp_vm_engine.h
@@ -14,7 +14,7 @@
 #define _INCLUDE_SOURCEPAWN_VM_ENGINE_H_
 
 #include "sp_vm_api.h"
-#include "sp_vm_function.h"
+#include "scripted-invoker.h"
 
 class BaseContext;