diff --git a/reapi/CMakeLists.txt b/reapi/CMakeLists.txt
index 5e064074..cfe8f930 100644
--- a/reapi/CMakeLists.txt
+++ b/reapi/CMakeLists.txt
@@ -111,7 +111,7 @@ set(REAPI_SRCS
 	"src/amxxmodule.cpp"
 	"src/h_export.cpp"
 	"src/dllapi.cpp"
-	"src/entity_callback.cpp"
+	"src/entity_callback_dispatcher.cpp"
 	"src/hook_callback.cpp"
 	"src/hook_list.cpp"
 	"src/hook_manager.cpp"
diff --git a/reapi/msvc/reapi.vcxproj b/reapi/msvc/reapi.vcxproj
index 5fdef54e..4573b111 100644
--- a/reapi/msvc/reapi.vcxproj
+++ b/reapi/msvc/reapi.vcxproj
@@ -210,7 +210,7 @@
     <ClInclude Include="..\src\amxxmodule.h" />
     <ClInclude Include="..\src\amx_hook.h" />
     <ClInclude Include="..\src\api_config.h" />
-    <ClInclude Include="..\src\entity_callback.h" />
+    <ClInclude Include="..\src\entity_callback_dispatcher.h" />
     <ClInclude Include="..\src\hook_manager.h" />
     <ClInclude Include="..\src\hook_callback.h" />
     <ClInclude Include="..\src\hook_list.h" />
@@ -255,7 +255,7 @@
     <ClCompile Include="..\src\api_config.cpp" />
     <ClCompile Include="..\src\dllapi.cpp" />
     <ClCompile Include="..\src\engine_api.cpp" />
-    <ClCompile Include="..\src\entity_callback.cpp" />
+    <ClCompile Include="..\src\entity_callback_dispatcher.cpp" />
     <ClCompile Include="..\src\hook_manager.cpp" />
     <ClCompile Include="..\src\hook_callback.cpp" />
     <ClCompile Include="..\src\hook_list.cpp" />
diff --git a/reapi/msvc/reapi.vcxproj.filters b/reapi/msvc/reapi.vcxproj.filters
index 99cf6ff6..41448a5c 100644
--- a/reapi/msvc/reapi.vcxproj.filters
+++ b/reapi/msvc/reapi.vcxproj.filters
@@ -699,7 +699,7 @@
     <ClInclude Include="..\common\info.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\entity_callback.h">
+    <ClInclude Include="..\src\entity_callback_dispatcher.h">
       <Filter>src</Filter>
     </ClInclude>
     <ClInclude Include="..\src\amx_hook.h">
@@ -821,7 +821,7 @@
     <ClCompile Include="..\common\info.cpp">
       <Filter>common</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\entity_callback.cpp">
+    <ClCompile Include="..\src\entity_callback_dispatcher.cpp">
       <Filter>src</Filter>
     </ClCompile>
     <ClCompile Include="..\src\amx_hook.cpp">