diff --git a/apps/selfhost/vm/boxes/mini_vm_core.nyash b/apps/selfhost/vm/boxes/mini_vm_core.nyash
index 503efbfa..c5bfdb34 100644
--- a/apps/selfhost/vm/boxes/mini_vm_core.nyash
+++ b/apps/selfhost/vm/boxes/mini_vm_core.nyash
@@ -1,8 +1,8 @@
-using selfhost.vm.json as MiniJson
-using selfhost.vm.scan as MiniVmScan
-using selfhost.vm.binop as MiniVmBinOp
-using selfhost.vm.compare as MiniVmCompare
-using selfhost.vm.prints as MiniVmPrints
+using selfhost.vm.boxes.json_cur as MiniJson
+using selfhost.common.mini_vm_scan as MiniVmScan
+using selfhost.common.mini_vm_binop as MiniVmBinOp
+using selfhost.common.mini_vm_compare as MiniVmCompare
+using selfhost.vm.boxes.mini_vm_prints as MiniVmPrints
 
 static box MiniVm {
   _is_digit(ch) {
@@ -745,5 +745,3 @@ static box MiniVm {
     return out
   }
 }
-
-// Program entry: prefer argv[0] JSON, fallback to embedded sample
diff --git a/apps/selfhost/vm/collect_empty_args_using_smoke.nyash b/apps/selfhost/vm/collect_empty_args_using_smoke.nyash
index c32c3caa..7cf4aec6 100644
--- a/apps/selfhost/vm/collect_empty_args_using_smoke.nyash
+++ b/apps/selfhost/vm/collect_empty_args_using_smoke.nyash
@@ -1,4 +1,4 @@
-using selfhost.vm.core as MiniVm
+using selfhost.vm.boxes.mini_vm_core as MiniVm
 
 static box Main {
   main(args) {
diff --git a/apps/selfhost/vm/collect_mixed_using_smoke.nyash b/apps/selfhost/vm/collect_mixed_using_smoke.nyash
index f5b9274e..178ec4b7 100644
--- a/apps/selfhost/vm/collect_mixed_using_smoke.nyash
+++ b/apps/selfhost/vm/collect_mixed_using_smoke.nyash
@@ -1,5 +1,5 @@
-using selfhost.vm.core as MiniVm
-using selfhost.vm.prints as MiniVmPrints
+using selfhost.vm.boxes.mini_vm_core as MiniVm
+using selfhost.vm.boxes.mini_vm_prints as MiniVmPrints
 
 static box Main {
   main(args) {