diff --git a/Source/Project64-rsp-core/RSPInfo.cpp b/Source/Project64-rsp-core/RSPInfo.cpp
index 506f54ad3..bf7e97e32 100644
--- a/Source/Project64-rsp-core/RSPInfo.cpp
+++ b/Source/Project64-rsp-core/RSPInfo.cpp
@@ -93,7 +93,7 @@ void RspPluginLoaded(void)
 {
     BreakOnStart = false;
     LogRDP = false;
-    LogX86Code = false;
+    LogAsmCode = false;
     Profiling = false;
     IndvidualBlock = false;
     ShowErrors = false;
diff --git a/Source/Project64-rsp-core/Settings/RspSettings.cpp b/Source/Project64-rsp-core/Settings/RspSettings.cpp
index e4cf0bfeb..9f115b04a 100644
--- a/Source/Project64-rsp-core/Settings/RspSettings.cpp
+++ b/Source/Project64-rsp-core/Settings/RspSettings.cpp
@@ -14,7 +14,7 @@ RSPCpuMethod CRSPSettings::m_CPUMethod = RSPCpuMethod::HighLevelEmulation;
 #endif
 
 uint16_t Set_AudioHle = 0, Set_GraphicsHle = 0, Set_MultiThreaded = 0, Set_AllocatedRdramSize = 0, Set_DirectoryLog = 0;
-bool GraphicsHle = true, AudioHle, ConditionalMove, SyncCPU = false, RspMultiThreaded = false, LogX86Code = false;
+bool GraphicsHle = true, AudioHle, ConditionalMove, SyncCPU = false, RspMultiThreaded = false, LogAsmCode = false;
 bool DebuggingEnabled = false, Profiling, IndvidualBlock, ShowErrors, BreakOnStart = false, LogRDP = false;
 
 void CRSPSettings::EnableDebugging(bool Enabled)
@@ -35,7 +35,7 @@ void CRSPSettings::InitializeRspSetting(void)
     RegisterSetting(Set_BreakOnStart, Data_DWORD_General, "Break on Start", NULL, BreakOnStart, NULL);
     RegisterSetting(Set_CPUCore, Data_DWORD_General, "CPU Method", NULL, (int)m_CPUMethod, NULL);
     RegisterSetting(Set_LogRDP, Data_DWORD_General, "Log RDP", NULL, LogRDP, NULL);
-    RegisterSetting(Set_LogX86Code, Data_DWORD_General, "Log X86 Code", NULL, LogX86Code, NULL);
+    RegisterSetting(Set_LogAsmCode, Data_DWORD_General, "Log X86 Code", NULL, LogAsmCode, NULL);
     RegisterSetting(Set_Profiling, Data_DWORD_General, "Profiling", NULL, Profiling, NULL);
     RegisterSetting(Set_IndvidualBlock, Data_DWORD_General, "Individual Block", NULL, IndvidualBlock, NULL);
     RegisterSetting(Set_ShowErrors, Data_DWORD_General, "Show Errors", NULL, ShowErrors, NULL);
diff --git a/Source/Project64-rsp-core/Settings/RspSettings.h b/Source/Project64-rsp-core/Settings/RspSettings.h
index ce4cbcf66..33f389ae2 100644
--- a/Source/Project64-rsp-core/Settings/RspSettings.h
+++ b/Source/Project64-rsp-core/Settings/RspSettings.h
@@ -3,7 +3,7 @@
 
 extern uint16_t Set_AudioHle, Set_GraphicsHle, Set_AllocatedRdramSize, Set_DirectoryLog;
 extern bool GraphicsHle, AudioHle, ConditionalMove, SyncCPU, RspMultiThreaded;
-extern bool DebuggingEnabled, Profiling, IndvidualBlock, ShowErrors, BreakOnStart, LogRDP, LogX86Code;
+extern bool DebuggingEnabled, Profiling, IndvidualBlock, ShowErrors, BreakOnStart, LogRDP, LogAsmCode;
 
 enum class RSPCpuMethod
 {
diff --git a/Source/Project64-rsp-core/Settings/RspSettingsID.h b/Source/Project64-rsp-core/Settings/RspSettingsID.h
index 4704cb674..f94b64315 100644
--- a/Source/Project64-rsp-core/Settings/RspSettingsID.h
+++ b/Source/Project64-rsp-core/Settings/RspSettingsID.h
@@ -5,7 +5,7 @@ enum
     Set_BreakOnStart,
     Set_CPUCore,
     Set_LogRDP,
-    Set_LogX86Code,
+    Set_LogAsmCode,
     Set_Profiling,
     Set_IndvidualBlock,
     Set_ShowErrors,
diff --git a/Source/Project64-rsp/Main.cpp b/Source/Project64-rsp/Main.cpp
index 09d1581d6..1b5e33743 100644
--- a/Source/Project64-rsp/Main.cpp
+++ b/Source/Project64-rsp/Main.cpp
@@ -190,7 +190,7 @@ void FixMenuState(void)
     CheckMenuItem(hRSPMenu, ID_BREAKONSTARTOFTASK, MF_BYCOMMAND | (BreakOnStart ? MFS_CHECKED : MF_UNCHECKED));
     CheckMenuItem(hRSPMenu, ID_LOGRDPCOMMANDS, MF_BYCOMMAND | (LogRDP ? MFS_CHECKED : MF_UNCHECKED));
     CheckMenuItem(hRSPMenu, ID_SETTINGS_SYNCCPU, MF_BYCOMMAND | (SyncCPU ? MFS_CHECKED : MF_UNCHECKED));
-    CheckMenuItem(hRSPMenu, ID_SETTINGS_LOGX86CODE, MF_BYCOMMAND | (LogX86Code ? MFS_CHECKED : MF_UNCHECKED));
+    CheckMenuItem(hRSPMenu, ID_SETTINGS_LOGASMCODE, MF_BYCOMMAND | (LogAsmCode ? MFS_CHECKED : MF_UNCHECKED));
     CheckMenuItem(hRSPMenu, ID_SETTINGS_MULTITHREADED, MF_BYCOMMAND | (MultiThreadedDefault ? MFS_CHECKED : MF_UNCHECKED));
     CheckMenuItem(hRSPMenu, ID_PROFILING_ON, MF_BYCOMMAND | (Profiling ? MFS_CHECKED : MF_UNCHECKED));
     CheckMenuItem(hRSPMenu, ID_PROFILING_OFF, MF_BYCOMMAND | (Profiling ? MFS_UNCHECKED : MF_CHECKED));
@@ -382,15 +382,15 @@ void ProcessMenuItem(int32_t ID)
         }
         break;
     }
-    case ID_SETTINGS_LOGX86CODE:
+    case ID_SETTINGS_LOGASMCODE:
     {
-        bool Checked = (GetMenuState(hRSPMenu, ID_SETTINGS_LOGX86CODE, MF_BYCOMMAND) & MFS_CHECKED) != 0;
-        CheckMenuItem(hRSPMenu, ID_SETTINGS_LOGX86CODE, MF_BYCOMMAND | (Checked ? MFS_UNCHECKED : MFS_CHECKED));
-        SetSetting(Set_LogX86Code, !Checked);
+        bool Checked = (GetMenuState(hRSPMenu, ID_SETTINGS_LOGASMCODE, MF_BYCOMMAND) & MFS_CHECKED) != 0;
+        CheckMenuItem(hRSPMenu, ID_SETTINGS_LOGASMCODE, MF_BYCOMMAND | (Checked ? MFS_UNCHECKED : MFS_CHECKED));
+        SetSetting(Set_LogAsmCode, !Checked);
         if (DebuggingEnabled)
         {
-            LogX86Code = !Checked;
-            if (LogX86Code)
+            LogAsmCode = !Checked;
+            if (LogAsmCode)
             {
                 StartCPULog();
             }
@@ -617,7 +617,7 @@ EXPORT void EnableDebugging(int Enabled)
     {
         BreakOnStart = GetSetting(Set_BreakOnStart) != 0;
         LogRDP = GetSetting(Set_LogRDP) != 0;
-        LogX86Code = GetSetting(Set_LogX86Code) != 0;
+        LogAsmCode = GetSetting(Set_LogAsmCode) != 0;
         Profiling = GetSetting(Set_Profiling) != 0;
         IndvidualBlock = GetSetting(Set_IndvidualBlock) != 0;
         ShowErrors = GetSetting(Set_ShowErrors) != 0;
@@ -645,7 +645,7 @@ EXPORT void EnableDebugging(int Enabled)
     {
         RDPLog.StartLog();
     }
-    if (LogX86Code)
+    if (LogAsmCode)
     {
         StartCPULog();
     }
diff --git a/Source/Project64-rsp/Project64-rsp.rc b/Source/Project64-rsp/Project64-rsp.rc
index 32e4bba8c..7a66e1ff2 100644
--- a/Source/Project64-rsp/Project64-rsp.rc
+++ b/Source/Project64-rsp/Project64-rsp.rc
@@ -195,7 +195,7 @@ BEGIN
         MENUITEM "Show Compiler Errors",        ID_SHOWCOMPILERERRORS
         MENUITEM "Break on start of task",      ID_BREAKONSTARTOFTASK
         MENUITEM "Log RDP Commands",            ID_LOGRDPCOMMANDS
-        MENUITEM "Log X86 code",                ID_SETTINGS_LOGX86CODE
+        MENUITEM "Log asm code",                ID_SETTINGS_LOGASMCODE
         MENUITEM "Sync CPU",                    ID_SETTINGS_SYNCCPU
         MENUITEM "Multithreaded",               ID_SETTINGS_MULTITHREADED
     END
diff --git a/Source/Project64-rsp/resource.h b/Source/Project64-rsp/resource.h
index 583633861..699a05c17 100644
--- a/Source/Project64-rsp/resource.h
+++ b/Source/Project64-rsp/resource.h
@@ -36,7 +36,7 @@
 #define ID_LOGRDPCOMMANDS               5015
 #define ID_CPUMETHOD_RECOMPILER         5016
 #define ID_CPUMETHOD_INTERPT            5017
-#define ID_SETTINGS_LOGX86CODE          5019
+#define ID_SETTINGS_LOGASMCODE          5019
 #define ID_SETTINGS_MULTITHREADED       5020
 #define ID_CPUMETHOD_HLE                5022
 #define ID_CPUMETHOD_RECOMPILER_TASKS   5023