diff --git a/Makefile b/Makefile
index d3460fba..36264f54 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,7 @@ $(BIN)/w6c_ww: selfhost/cmd/w6c/main.ww \
 # ---- ww-side w6a (assembler port, exercised by 991_w6a_ww) ------------
 # Built like wwdump_ww. Needs -I selfhost/cmd/w6a for the local types/lex/
 # parse/asm/obj modules and -I selfhost/cmd/wcc to find `mem`.
-$(BIN)/w6a_ww: selfhost/cmd/w6a/main.ww selfhost/cmd/w6a/types.ww \
+$(BIN)/w6a_ww: selfhost/cmd/w6a/main.ww selfhost/cmd/w6a/opcodes.ww \
 		selfhost/cmd/w6a/lex.ww selfhost/cmd/w6a/parse.ww \
 		selfhost/cmd/w6a/asm.ww selfhost/cmd/w6a/obj.ww \
 		selfhost/cmd/wcc/mem.ww \
diff --git a/selfhost/cmd/w6a/asm.ww b/selfhost/cmd/w6a/asm.ww
index 218a5512..657d8013 100644
--- a/selfhost/cmd/w6a/asm.ww
+++ b/selfhost/cmd/w6a/asm.ww
@@ -14,7 +14,7 @@ package w6a;
 import os;
 import rt;
 import mem;
-import types;
+import opcodes;
 
 // ---- text buffer growth ------------------------------------------------
 
diff --git a/selfhost/cmd/w6a/main.combined.ww b/selfhost/cmd/w6a/main.combined.ww
index 9be84fba..12b65d20 100644
--- a/selfhost/cmd/w6a/main.combined.ww
+++ b/selfhost/cmd/w6a/main.combined.ww
@@ -860,7 +860,7 @@ export fn freearena(a: *arena) void = {
 	};
 };
 
-// selfhost/cmd/w6a/types.ww — types + constants shared across the
+// selfhost/cmd/w6a/opcodes.ww — types + constants shared across the
 // w6a port. Mirrors cmd/w6a/a.h and cmd/w6c/6.out.h.
 
 package w6a;
@@ -1167,7 +1167,7 @@ package w6a;
 import os;
 import mem;
 import lex;
-import types;
+import opcodes;
 
 fn streqlit(p: *u8, n: u64, lit: str) bool = {
 	if (n != lit.len: u64) { return false; };
@@ -1752,7 +1752,7 @@ package w6a;
 import os;
 import rt;
 import mem;
-import types;
+import opcodes;
 
 // ---- text buffer growth ------------------------------------------------
 
@@ -2606,7 +2606,7 @@ package w6a;
 
 import os;
 import mem;
-import types;
+import opcodes;
 
 // Local wrappers around os.writeall's tagged return — collapse the
 // (i64 | oserror) back to a boolean / int sentinel for the
@@ -3016,7 +3016,7 @@ package main;
 import os;
 import rt;
 import mem;
-import types;
+import opcodes;
 import lex;
 import parse;
 import asm;
diff --git a/selfhost/cmd/w6a/main.ww b/selfhost/cmd/w6a/main.ww
index 35b6951b..f3eed078 100644
--- a/selfhost/cmd/w6a/main.ww
+++ b/selfhost/cmd/w6a/main.ww
@@ -9,7 +9,7 @@ package main;
 import os;
 import rt;
 import mem;
-import types;
+import opcodes;
 import lex;
 import parse;
 import asm;
diff --git a/selfhost/cmd/w6a/obj.ww b/selfhost/cmd/w6a/obj.ww
index 6683b192..218ddc8f 100644
--- a/selfhost/cmd/w6a/obj.ww
+++ b/selfhost/cmd/w6a/obj.ww
@@ -15,7 +15,7 @@ package w6a;
 
 import os;
 import mem;
-import types;
+import opcodes;
 
 // Local wrappers around os.writeall's tagged return — collapse the
 // (i64 | oserror) back to a boolean / int sentinel for the
diff --git a/selfhost/cmd/w6a/types.ww b/selfhost/cmd/w6a/opcodes.ww
similarity index 98%
rename from selfhost/cmd/w6a/types.ww
rename to selfhost/cmd/w6a/opcodes.ww
index 04f78ec3..235d8260 100644
--- a/selfhost/cmd/w6a/types.ww
+++ b/selfhost/cmd/w6a/opcodes.ww
@@ -1,4 +1,4 @@
-// selfhost/cmd/w6a/types.ww — types + constants shared across the
+// selfhost/cmd/w6a/opcodes.ww — types + constants shared across the
 // w6a port. Mirrors cmd/w6a/a.h and cmd/w6c/6.out.h.
 
 package w6a;
diff --git a/selfhost/cmd/w6a/parse.ww b/selfhost/cmd/w6a/parse.ww
index 1b1d05ca..dff8ab3b 100644
--- a/selfhost/cmd/w6a/parse.ww
+++ b/selfhost/cmd/w6a/parse.ww
@@ -15,7 +15,7 @@ package w6a;
 import os;
 import mem;
 import lex;
-import types;
+import opcodes;
 
 fn streqlit(p: *u8, n: u64, lit: str) bool = {
 	if (n != lit.len: u64) { return false; };