--- a/build.xml
+++ b/build.xml
@@ -1576,9 +1576,9 @@
   <!-- Generate JNI headers for JVMTI wrapper -->
   <target name="gen-jvmti-headers" depends="gen-asm">
     <mkdir dir="${build.native}"/>
-    <javah outputFile="${build.native}/org_jikesrvm_runtime_jvmti_JVMTIAgent.h"
+    <javah outputFile="${build.native}/org_jikesrvm_runtime_jvmti_JVMTIEventTrampoline.h"
            classPath="${build.vm.jar}">
-      <class name="org.jikesrvm.runtime.jvmti.JVMTIAgent"/>
+      <class name="org.jikesrvm.runtime.jvmti.JVMTIEventTrampoline"/>
     </javah>
   </target>
 
@@ -1725,7 +1725,7 @@
       <arg value="-L${build.base}"/>
       <arg value="-lrvm"/>
       <arg value="${bl.dir}/org_jikesrvm_runtime_DynamicLibrary.c"/>
-      <arg value="${bl.dir}/org_jikesrvm_runtime_jvmti_JVMTIAgent.c"/>
+      <arg value="${bl.dir}/org_jikesrvm_runtime_jvmti_JVMTIEventTrampoline.c"/>
     </exec>
 
     <condition property="perfevent.lib" value="-lpfm" else="">