diff --git a/Makefile b/Makefile
index be93e90d..4c937913 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ CLOSURE_FLAGS=\
 
 CORE_FILES=const.js io.js main.js fpu.js ide.js pci.js floppy.js memory.js\
 		   dma.js pit.js vga.js ps2.js pic.js rtc.js uart.js hpet.js acpi.js\
-		   cpu_state.js ne2k.js virtio.js
+		   state.js ne2k.js virtio.js
 LIB_FILES=../lib/9p.js ../lib/filesystem.js ../lib/jor1k.js ../lib/marshall.js ../lib/utf8.js
 BROWSER_FILES=browser/main.js browser/screen.js\
 			  browser/keyboard.js browser/mouse.js browser/serial.js\
diff --git a/loader.js b/loader.js
index 3da59f39..680ea23e 100644
--- a/loader.js
+++ b/loader.js
@@ -4,7 +4,7 @@
 {
     var CORE_FILES = "const.js io.js main.js ide.js fpu.js pci.js floppy.js " +
                      "memory.js dma.js pit.js vga.js ps2.js pic.js rtc.js uart.js acpi.js hpet.js " +
-                     "ne2k.js cpu_state.js virtio.js";
+                     "ne2k.js state.js virtio.js";
     var BROWSER_FILES = "main.js screen.js keyboard.js mouse.js serial.js lib.js network.js";
     var LIB_FILES = "esprima.js walk.js";
 
diff --git a/src/cpu_state.js b/src/state.js
similarity index 100%
rename from src/cpu_state.js
rename to src/state.js