diff --git a/src/windows-emulator/context_frame.cpp b/src/windows-emulator/cpu_context.cpp
similarity index 99%
rename from src/windows-emulator/context_frame.cpp
rename to src/windows-emulator/cpu_context.cpp
index e7adf26b..5167bc46 100644
--- a/src/windows-emulator/context_frame.cpp
+++ b/src/windows-emulator/cpu_context.cpp
@@ -1,7 +1,7 @@
 #include "std_include.hpp"
-#include "context_frame.hpp"
+#include "cpu_context.hpp"
 
-namespace context_frame
+namespace cpu_context
 {
     void restore(x64_emulator& emu, const CONTEXT64& context)
     {
diff --git a/src/windows-emulator/context_frame.hpp b/src/windows-emulator/cpu_context.hpp
similarity index 87%
rename from src/windows-emulator/context_frame.hpp
rename to src/windows-emulator/cpu_context.hpp
index 8f7e5bcd..c702e002 100644
--- a/src/windows-emulator/context_frame.hpp
+++ b/src/windows-emulator/cpu_context.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "x64_emulator.hpp"
 
-namespace context_frame
+namespace cpu_context
 {
     void save(x64_emulator& emu, CONTEXT64& context);
     void restore(x64_emulator& emu, const CONTEXT64& context);
diff --git a/src/windows-emulator/emulator_thread.cpp b/src/windows-emulator/emulator_thread.cpp
index 0ba0fde2..40d43697 100644
--- a/src/windows-emulator/emulator_thread.cpp
+++ b/src/windows-emulator/emulator_thread.cpp
@@ -1,6 +1,6 @@
 #include "emulator_thread.hpp"
 
-#include "context_frame.hpp"
+#include "cpu_context.hpp"
 #include "process_context.hpp"
 
 namespace
@@ -226,7 +226,7 @@ void emulator_thread::setup_registers(x64_emulator& emu, const process_context&
     ctx.ContextFlags = CONTEXT64_ALL;
 
     unalign_stack(emu);
-    context_frame::save(emu, ctx);
+    cpu_context::save(emu, ctx);
 
     ctx.Rip = context.rtl_user_thread_start;
     ctx.Rcx = this->start_address;
diff --git a/src/windows-emulator/exception_dispatch.cpp b/src/windows-emulator/exception_dispatch.cpp
index d5ff06b8..1db01ee6 100644
--- a/src/windows-emulator/exception_dispatch.cpp
+++ b/src/windows-emulator/exception_dispatch.cpp
@@ -1,6 +1,6 @@
 #include "exception_dispatch.hpp"
 #include "process_context.hpp"
-#include "context_frame.hpp"
+#include "cpu_context.hpp"
 
 #include <platform/status.hpp>
 
@@ -146,7 +146,7 @@ void dispatch_exception(x64_emulator& emu, const process_context& proc, const DW
 {
     CONTEXT64 ctx{};
     ctx.ContextFlags = CONTEXT64_ALL;
-    context_frame::save(emu, ctx);
+    cpu_context::save(emu, ctx);
 
     exception_record record{};
     memset(&record, 0, sizeof(record));
diff --git a/src/windows-emulator/syscalls.cpp b/src/windows-emulator/syscalls.cpp
index 4695e0d8..86af4125 100644
--- a/src/windows-emulator/syscalls.cpp
+++ b/src/windows-emulator/syscalls.cpp
@@ -1,6 +1,6 @@
 #include "std_include.hpp"
 #include "syscall_dispatcher.hpp"
-#include "context_frame.hpp"
+#include "cpu_context.hpp"
 #include "emulator_utils.hpp"
 #include "syscall_utils.hpp"
 
@@ -2775,7 +2775,7 @@ namespace
         c.write_status = false;
 
         const auto context = thread_context.read();
-        context_frame::restore(c.emu, context);
+        cpu_context::restore(c.emu, context);
 
         return STATUS_SUCCESS;
     }
@@ -3800,7 +3800,7 @@ namespace
                 c.win_emu.log.print(color::pink, "--> Reading debug registers!\n");
             }
 
-            context_frame::save(c.emu, context);
+            cpu_context::save(c.emu, context);
         });
 
         return STATUS_SUCCESS;
@@ -3832,7 +3832,7 @@ namespace
         });
 
         const auto context = thread_context.read();
-        context_frame::restore(c.emu, context);
+        cpu_context::restore(c.emu, context);
 
         if ((context.ContextFlags & CONTEXT_DEBUG_REGISTERS_64) == CONTEXT_DEBUG_REGISTERS_64)
         {
diff --git a/src/windows-emulator/windows_emulator.cpp b/src/windows-emulator/windows_emulator.cpp
index 358ef143..ac51ff9e 100644
--- a/src/windows-emulator/windows_emulator.cpp
+++ b/src/windows-emulator/windows_emulator.cpp
@@ -2,7 +2,7 @@
 #include "windows_emulator.hpp"
 
 #include "address_utils.hpp"
-#include "context_frame.hpp"
+#include "cpu_context.hpp"
 
 #include <unicorn_x64_emulator.hpp>