diff --git a/crates/prometeu-core/src/lib.rs b/crates/prometeu-core/src/lib.rs
index 50aff840..98d09d44 100644
--- a/crates/prometeu-core/src/lib.rs
+++ b/crates/prometeu-core/src/lib.rs
@@ -1,5 +1,5 @@
 pub mod hardware;
-pub mod vm;
+pub mod virtual_machine;
 mod model;
 pub mod firmware;
 mod prometeu_os;
diff --git a/crates/prometeu-core/src/model/cartridge.rs b/crates/prometeu-core/src/model/cartridge.rs
index 7eef99fa..1074be99 100644
--- a/crates/prometeu-core/src/model/cartridge.rs
+++ b/crates/prometeu-core/src/model/cartridge.rs
@@ -1,4 +1,4 @@
-use crate::vm::Program;
+use crate::virtual_machine::Program;
 
 #[derive(Debug, Clone)]
 pub struct AppHeader {
diff --git a/crates/prometeu-core/src/prometeu_os/mod.rs b/crates/prometeu-core/src/prometeu_os/mod.rs
index df032309..64c645ec 100644
--- a/crates/prometeu-core/src/prometeu_os/mod.rs
+++ b/crates/prometeu-core/src/prometeu_os/mod.rs
@@ -1,4 +1,4 @@
 mod prometeu_os;
 
 pub use prometeu_os::PrometeuOS;
-pub use crate::vm::native_interface::NativeInterface;
\ No newline at end of file
+pub use crate::virtual_machine::native_interface::NativeInterface;
\ No newline at end of file
diff --git a/crates/prometeu-core/src/prometeu_os/prometeu_os.rs b/crates/prometeu-core/src/prometeu_os/prometeu_os.rs
index 0500a77d..e2858ec0 100644
--- a/crates/prometeu-core/src/prometeu_os/prometeu_os.rs
+++ b/crates/prometeu-core/src/prometeu_os/prometeu_os.rs
@@ -1,6 +1,6 @@
 use crate::model::{Cartridge, Color, Sample};
 use crate::hardware::{HardwareBridge, InputSignals};
-use crate::vm::{Value, VirtualMachine};
+use crate::virtual_machine::{Value, VirtualMachine};
 use std::sync::Arc;
 use crate::prometeu_os::NativeInterface;
 
@@ -70,7 +70,7 @@ impl PrometeuOS {
 
         match run_result {
             Ok(run) => {
-                if run.reason == crate::vm::LogicalFrameEndingReason::FrameSync {
+                if run.reason == crate::virtual_machine::LogicalFrameEndingReason::FrameSync {
                     hw.gfx_mut().render_all();
                     self.end_logical_frame(hw);
                     self.logical_frame_index += 1;
@@ -159,7 +159,7 @@ impl NativeInterface for PrometeuOS {
         match id {
             // system.has_cart() -> bool
             0x0001 => {
-                // vm.push(Value::Boolean(self.current_cartridge.is_some()));
+                // virtual_machine.push(Value::Boolean(self.current_cartridge.is_some()));
                 Ok(10)
             }
             // system.run_cart()
diff --git a/crates/prometeu-core/src/vm/call_frame.rs b/crates/prometeu-core/src/virtual_machine/call_frame.rs
similarity index 100%
rename from crates/prometeu-core/src/vm/call_frame.rs
rename to crates/prometeu-core/src/virtual_machine/call_frame.rs
diff --git a/crates/prometeu-core/src/vm/mod.rs b/crates/prometeu-core/src/virtual_machine/mod.rs
similarity index 100%
rename from crates/prometeu-core/src/vm/mod.rs
rename to crates/prometeu-core/src/virtual_machine/mod.rs
diff --git a/crates/prometeu-core/src/vm/native_interface.rs b/crates/prometeu-core/src/virtual_machine/native_interface.rs
similarity index 80%
rename from crates/prometeu-core/src/vm/native_interface.rs
rename to crates/prometeu-core/src/virtual_machine/native_interface.rs
index 59839042..a5ce0f1f 100644
--- a/crates/prometeu-core/src/vm/native_interface.rs
+++ b/crates/prometeu-core/src/virtual_machine/native_interface.rs
@@ -1,5 +1,5 @@
 use crate::hardware::HardwareBridge;
-use crate::vm::VirtualMachine;
+use crate::virtual_machine::VirtualMachine;
 
 pub trait NativeInterface {
     fn syscall(&mut self, id: u32, vm: &mut VirtualMachine, hw: &mut dyn HardwareBridge) -> Result<u64, String>;
diff --git a/crates/prometeu-core/src/vm/opcode.rs b/crates/prometeu-core/src/virtual_machine/opcode.rs
similarity index 100%
rename from crates/prometeu-core/src/vm/opcode.rs
rename to crates/prometeu-core/src/virtual_machine/opcode.rs
diff --git a/crates/prometeu-core/src/vm/program.rs b/crates/prometeu-core/src/virtual_machine/program.rs
similarity index 90%
rename from crates/prometeu-core/src/vm/program.rs
rename to crates/prometeu-core/src/virtual_machine/program.rs
index f92a9e6f..616dd51b 100644
--- a/crates/prometeu-core/src/vm/program.rs
+++ b/crates/prometeu-core/src/virtual_machine/program.rs
@@ -1,5 +1,5 @@
 use std::sync::Arc;
-use crate::vm::Value;
+use crate::virtual_machine::Value;
 
 #[derive(Debug, Clone, Default)]
 pub struct Program {
diff --git a/crates/prometeu-core/src/vm/value.rs b/crates/prometeu-core/src/virtual_machine/value.rs
similarity index 100%
rename from crates/prometeu-core/src/vm/value.rs
rename to crates/prometeu-core/src/virtual_machine/value.rs
diff --git a/crates/prometeu-core/src/vm/virtual_machine.rs b/crates/prometeu-core/src/virtual_machine/virtual_machine.rs
similarity index 98%
rename from crates/prometeu-core/src/vm/virtual_machine.rs
rename to crates/prometeu-core/src/virtual_machine/virtual_machine.rs
index 1cb11001..94240f09 100644
--- a/crates/prometeu-core/src/vm/virtual_machine.rs
+++ b/crates/prometeu-core/src/virtual_machine/virtual_machine.rs
@@ -1,9 +1,9 @@
 use crate::hardware::HardwareBridge;
 use crate::prometeu_os::NativeInterface;
-use crate::vm::call_frame::CallFrame;
-use crate::vm::opcode::OpCode;
-use crate::vm::value::Value;
-use crate::vm::Program;
+use crate::virtual_machine::call_frame::CallFrame;
+use crate::virtual_machine::opcode::OpCode;
+use crate::virtual_machine::value::Value;
+use crate::virtual_machine::Program;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum LogicalFrameEndingReason {