diff --git a/Source/Project64/UserInterface/API.js b/Source/Project64/UserInterface/API.js
index 044b5b1e6..27f3fcf4a 100644
--- a/Source/Project64/UserInterface/API.js
+++ b/Source/Project64/UserInterface/API.js
@@ -299,10 +299,10 @@ const events = (function()
 
             return events.on('exec', callback, param, param2)
         },
-        onexecvalue: function(addr, value, arg3, arg4)
+        onexecopcode: function(addr, value, arg3, arg4)
         {
-            // onexecvalue(addr, value, callback)
-            // onexecvalue(addr, value, mask, callback)
+            // onexecopcode(addr, value, callback)
+            // onexecopcode(addr, value, mask, callback)
 
             var start = 0;
             var end = 0;
@@ -331,7 +331,7 @@ const events = (function()
             }
 
             this._stashCallback(callback);
-            return _native.addCallback('execvalue', callback, start, end, value, mask)
+            return _native.addCallback('execopcode', callback, start, end, value, mask)
         },
         onread: function(addr, callback)
         {
diff --git a/Source/Project64/UserInterface/Debugger/Debugger.cpp b/Source/Project64/UserInterface/Debugger/Debugger.cpp
index d4bcbb4f7..bae453abb 100644
--- a/Source/Project64/UserInterface/Debugger/Debugger.cpp
+++ b/Source/Project64/UserInterface/Debugger/Debugger.cpp
@@ -391,7 +391,7 @@ void CDebuggerUI::CPUStepStarted()
     uint32_t JumpToLocation = R4300iOp::m_JumpToLocation;
 
     m_ScriptSystem->HookCPUExec()->InvokeByParamInRange(PROGRAM_COUNTER);
-    m_ScriptSystem->HookCPUExecValue()->InvokeByParamInRangeWithMaskedValue(PROGRAM_COUNTER, R4300iOp::m_Opcode.Hex);
+    m_ScriptSystem->HookCPUExecOpcode()->InvokeByParamInRangeWithMaskedValue(PROGRAM_COUNTER, R4300iOp::m_Opcode.Hex);
 
     // Memory breakpoints
 
diff --git a/Source/Project64/UserInterface/Debugger/ScriptSystem.cpp b/Source/Project64/UserInterface/Debugger/ScriptSystem.cpp
index 28d22d31d..b9bb43732 100644
--- a/Source/Project64/UserInterface/Debugger/ScriptSystem.cpp
+++ b/Source/Project64/UserInterface/Debugger/ScriptSystem.cpp
@@ -25,7 +25,7 @@ CScriptSystem::CScriptSystem(CDebuggerUI* debugger)
     m_Debugger = debugger;
 
     m_HookCPUExec = new CScriptHook(this);
-    m_HookCPUExecValue = new CScriptHook(this);
+    m_HookCPUExecOpcode = new CScriptHook(this);
     m_HookCPURead = new CScriptHook(this);
     m_HookCPUWrite = new CScriptHook(this);
     m_HookFrameDrawn = new CScriptHook(this);
@@ -34,7 +34,7 @@ CScriptSystem::CScriptSystem(CDebuggerUI* debugger)
     RegisterHook("read", m_HookCPURead);
     RegisterHook("write", m_HookCPUWrite);
     RegisterHook("draw", m_HookFrameDrawn);
-    RegisterHook("execvalue", m_HookCPUExecValue);
+    RegisterHook("execopcode", m_HookCPUExecOpcode);
 
     HMODULE hInst = GetModuleHandle(NULL);
     HRSRC hRes = FindResource(hInst, MAKEINTRESOURCE(IDR_JSAPI_TEXT), "TEXT");
diff --git a/Source/Project64/UserInterface/Debugger/ScriptSystem.h b/Source/Project64/UserInterface/Debugger/ScriptSystem.h
index 351619540..ea2625c44 100644
--- a/Source/Project64/UserInterface/Debugger/ScriptSystem.h
+++ b/Source/Project64/UserInterface/Debugger/ScriptSystem.h
@@ -54,7 +54,7 @@ private:
     CScriptHook* m_HookCPUExec;
     CScriptHook* m_HookCPURead;
     CScriptHook* m_HookCPUWrite;
-    CScriptHook* m_HookCPUExecValue;
+    CScriptHook* m_HookCPUExecOpcode;
 
     CScriptHook* m_HookFrameDrawn;
 
@@ -121,9 +121,9 @@ public:
         return m_HookCPUWrite;
     }
 
-    CScriptHook* HookCPUExecValue()
+    CScriptHook* HookCPUExecOpcode()
     {
-        return m_HookCPUExecValue;
+        return m_HookCPUExecOpcode;
     }
 
     CScriptHook* HookFrameDrawn()