diff --git a/.gitignore b/.gitignore
index 6b7ee0b4..eb2d9027 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ packages/*.txz
 packages/.repo/
 
 # Temporary files
+/tmp/
 *.tmp
 *.bak
 *.swp
diff --git a/BUILD.md b/BUILD.md
index 59288453..6f4055dc 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -131,7 +131,8 @@ Expected result: "Integration test passed: All 6 modules executed with state han
 
 ```bash
 # Boot the ISO in bhyve VM (includes bsdinstall + firstboot)
-sudo /tmp/bhyve-test-setup.sh
+cd /home/clawdie/clawdie-iso
+sudo ./tmp/bhyve-test-setup.sh
 
 # Follow installer prompts
 # Then verify: GPU detection, package repos, Clawdie deployment
diff --git a/TESTING.md b/TESTING.md
index 2346725a..f681a525 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -104,7 +104,8 @@ All should succeed. You need:
 
 ```bash
 # This will create a bhyve VM and boot the ISO
-sudo /tmp/bhyve-test-setup.sh
+cd /home/clawdie/clawdie-iso
+sudo ./tmp/bhyve-test-setup.sh
 ```
 
 ### Boot sequence
@@ -226,7 +227,8 @@ sudo ./build.sh --skip-fetch
 ```bash
 # Destroy and retry
 bhyvectl --vm=clawdie-test --destroy
-sudo /tmp/bhyve-test-setup.sh
+cd /home/clawdie/clawdie-iso
+sudo ./tmp/bhyve-test-setup.sh
 ```
 
 ### Firstboot doesn't trigger
diff --git a/firstboot/integration-test.sh b/firstboot/integration-test.sh
index 35cae8cd..999755ac 100755
--- a/firstboot/integration-test.sh
+++ b/firstboot/integration-test.sh
@@ -59,40 +59,40 @@ echo ""
 
 # STAGE 1: ENV
 echo "[1/6] clawdie-shell-env.sh → Identity + .env"
-. /home/clawdie/clawdie-iso/firstboot/clawdie-shell-env.sh 2>/dev/null
+. /home/clawdie/clawdie-iso/firstboot/shell-env.sh 2>/dev/null
 clawdie_shell_env_generate 2>/dev/null
 [ -f "$ENV_FILE" ] && echo "  ✓ .env created (65 variables)" || echo "  ✗ .env missing"
 
 # STAGE 2: PKG
 echo "[2/6] clawdie-shell-pkg.sh → Repos (online + offline USB)"
-. /home/clawdie/clawdie-iso/firstboot/clawdie-shell-pkg.sh 2>/dev/null
+. /home/clawdie/clawdie-iso/firstboot/shell-pkg.sh 2>/dev/null
 clawdie_shell_pkg_setup 2>/dev/null
 [ -f "$FREEBSD_REPO_CONF" ] && echo "  ✓ FreeBSD repo configured" || echo "  ✗ FreeBSD repo missing"
 [ -f "$CLAWDIE_USB_REPO_CONF" ] && echo "  ✓ USB repo configured" || echo "  ✗ USB repo missing"
 
 # STAGE 3: GPU
 echo "[3/6] clawdie-shell-gpu.sh → GPU detection (Intel)"
-. /home/clawdie/clawdie-iso/firstboot/clawdie-shell-gpu.sh 2>/dev/null
+. /home/clawdie/clawdie-iso/firstboot/shell-gpu.sh 2>/dev/null
 clawdie_shell_gpu_detect 2>/dev/null
 echo "  ✓ GPU detection: $DETECTED_GPU"
 [ -f "$RC_CONF" ] && echo "  ✓ rc.conf updated" || echo "  ✗ rc.conf missing"
 
 # STAGE 4: NVIDIA
 echo "[4/6] clawdie-shell-nvidia.sh → NVIDIA driver (skipped for Intel)"
-. /home/clawdie/clawdie-iso/firstboot/clawdie-shell-nvidia.sh 2>/dev/null
+. /home/clawdie/clawdie-iso/firstboot/shell-nvidia.sh 2>/dev/null
 clawdie_shell_nvidia_detect 2>/dev/null
 echo "  ✓ NVIDIA module: skipped (correct for Intel GPU)"
 
 # STAGE 5: SYSTEM
 echo "[5/6] clawdie-shell-system.sh → Hostname, timezone, services"
-. /home/clawdie/clawdie-iso/firstboot/clawdie-shell-system.sh 2>/dev/null
+. /home/clawdie/clawdie-iso/firstboot/shell-system.sh 2>/dev/null
 clawdie_shell_system_config 2>/dev/null
 [ -f "$HOSTNAME_FILE" ] && echo "  ✓ Hostname: $(cat "$HOSTNAME_FILE")" || echo "  ✗ Hostname missing"
 [ -f "$PROFILE_DIR/clawdie.sh" ] && echo "  ✓ Profile.d/clawdie.sh created" || echo "  ✗ Profile missing"
 
 # STAGE 6: DEPLOY
 echo "[6/6] clawdie-shell-deploy.sh → Clawdie-AI deployment"
-. /home/clawdie/clawdie-iso/firstboot/clawdie-shell-deploy.sh 2>/dev/null
+. /home/clawdie/clawdie-iso/firstboot/shell-deploy.sh 2>/dev/null
 clawdie_shell_deploy 2>/dev/null
 [ -f "$CLAWDIE_AI_DIR/package.json" ] && echo "  ✓ Clawdie-AI deployed" || echo "  ✗ Clawdie-AI missing"
 [ -d "$CLAWDIE_AI_DIR/node_modules" ] && echo "  ✓ node_modules installed" || echo "  ✗ node_modules missing"