diff --git a/shodan_boot.robot b/shodan_boot.robot
index 1242242..31a0d92 100644
--- a/shodan_boot.robot
+++ b/shodan_boot.robot
@@ -18,21 +18,19 @@
 ${PROMPT}                        CANTRIP>
 ${UART5}                         sysbus.uart5
 
-${MATCHA_BUNDLE_RELEASE}         ${ROOTDIR}/out/matcha-bundle-release.elf
-${MATCHA_BUNDLE_DEBUG}           ${ROOTDIR}/out/matcha-bundle-debug.elf
-
-${CANTRIP_KERNEL_RELEASE}        ${ROOTDIR}/out/cantrip/riscv32-unknown-elf/release/kernel/kernel.elf
-${CANTRIP_ROOTSERVER_RELEASE}    ${ROOTDIR}/out/cantrip/riscv32-unknown-elf/release/capdl-loader
-
-${CANTRIP_KERNEL_DEBUG}          ${ROOTDIR}/out/cantrip/riscv32-unknown-elf/debug/kernel/kernel.elf
-${CANTRIP_ROOTSERVER_DEBUG}      ${ROOTDIR}/out/cantrip/riscv32-unknown-elf/debug/capdl-loader
-
 ${OUT_TMP}                       ${ROOTDIR}/out/tmp
 
-${FLASH_RELEASE_TAR}             out/ext_flash_release.tar
-${CPIO_RELEASE}                  out/cantrip/riscv32-unknown-elf/release/ext_builtins.cpio
-${FLASH_DEBUG_TAR}               out/ext_flash_debug.tar
-${CPIO_DEBUG}                    out/cantrip/riscv32-unknown-elf/debug/ext_builtins.cpio
+${MATCHA_BUNDLE_RELEASE}         ${ROOTDIR}/out/matcha-bundle-release.elf
+${CANTRIP_KERNEL_RELEASE}        ${ROOTDIR}/out/cantrip/shodan/release/kernel/kernel.elf
+${CANTRIP_ROOTSERVER_RELEASE}    ${ROOTDIR}/out/cantrip/shodan/release/capdl-loader
+${FLASH_RELEASE_TAR}             out/cantrip/shodan/release/ext_flash.tar
+${CPIO_RELEASE}                  out/cantrip/shodan/release/ext_builtins.cpio
+
+${MATCHA_BUNDLE_DEBUG}           ${ROOTDIR}/out/matcha-bundle-debug.elf
+${CANTRIP_KERNEL_DEBUG}          ${ROOTDIR}/out/cantrip/shodan/debug/kernel/kernel.elf
+${CANTRIP_ROOTSERVER_DEBUG}      ${ROOTDIR}/out/cantrip/shodan/debug/capdl-loader
+${FLASH_DEBUG_TAR}               out/cantrip/shodan/debug/ext_flash.tar
+${CPIO_DEBUG}                    out/cantrip/shodan/debug/ext_builtins.cpio
 
 *** Keywords ***
 Prepare Machine
@@ -73,7 +71,7 @@
 
 *** Test Cases ***
 Prepare Flash Tarball
-    Run Process                 mkdir  -p    ${ROOTDIR}/out/tmp
+    Run Process                 mkdir  -p    ${OUT_TMP}
 
     IF     ${RUN_DEBUG} == 1
       Run Process                 cp     -f  ${MATCHA_BUNDLE_DEBUG}       ${OUT_TMP}/matcha-tock-bundle-debug
diff --git a/shodan_sel4test.robot b/shodan_sel4test.robot
index a700aad..86c09ab 100644
--- a/shodan_sel4test.robot
+++ b/shodan_sel4test.robot
@@ -21,14 +21,16 @@
 ${UART5}                         sysbus.uart5
 
 ${MATCHA_BUNDLE_RELEASE}         ${ROOTDIR}/out/matcha-bundle-release.elf
-${SEL4TEST_WRAPPER_KERNEL}       ${ROOTDIR}/out/sel4test-wrapper/riscv32-unknown-elf/debug/kernel/kernel.elf
-${SEL4TEST_WRAPPER_ROOTSERVER}   ${ROOTDIR}/out/sel4test-wrapper/riscv32-unknown-elf/debug/apps/sel4test-driver/sel4test-driver
-${SEL4TEST_KERNEL}               ${ROOTDIR}/out/sel4test/riscv32-unknown-elf/debug/kernel/kernel.elf
-${SEL4TEST_ROOTSERVER}           ${ROOTDIR}/out/sel4test/riscv32-unknown-elf/debug/apps/sel4test-driver/sel4test-driver
+
 ${OUT_TMP}                       ${ROOTDIR}/out/tmp
 
-${FLASH_WRAPPER_TAR}             out/sel4test-wrapper/riscv32-unknown-elf/debug/ext_flash.tar
-${FLASH_TAR}                     out/sel4test/riscv32-unknown-elf/debug/ext_flash.tar
+${SEL4TEST_WRAPPER_KERNEL}       ${ROOTDIR}/out/sel4test-wrapper/shodan/debug/kernel/kernel.elf
+${SEL4TEST_WRAPPER_ROOTSERVER}   ${ROOTDIR}/out/sel4test-wrapper/shodan/debug/apps/sel4test-driver/sel4test-driver
+${FLASH_WRAPPER_TAR}             out/sel4test-wrapper/shodan/debug/ext_flash.tar
+
+${SEL4TEST_KERNEL}               ${ROOTDIR}/out/sel4test/shodan/debug/kernel/kernel.elf
+${SEL4TEST_ROOTSERVER}           ${ROOTDIR}/out/sel4test/shodan/debug/apps/sel4test-driver/sel4test-driver
+${FLASH_TAR}                     out/sel4test/shodan/debug/ext_flash.tar
 
 *** Keywords ***
 Prepare Machine
@@ -50,17 +52,22 @@
 
 *** Test Cases ***
 Prepare Flash Tarball
-    Run Process                 mkdir  -p   ${ROOTDIR}/out/tmp
-    Run Process                 cp     -f  ${MATCHA_BUNDLE_RELEASE}       ${OUT_TMP}/matcha-tock-bundle
-    Run Process                 riscv32-unknown-elf-strip  ${OUT_TMP}/matcha-tock-bundle
-    Run Process                 riscv32-unknown-elf-objcopy  -O  binary  -g  ${OUT_TMP}/matcha-tock-bundle  ${OUT_TMP}/matcha-tock-bundle.bin
+    # NB: must have at least 2x spaces between Run Process arguments!
     IF      ${RUN_WRAPPER} == 1
-      Run Process               ln  -sfr  ${SEL4TEST_WRAPPER_KERNEL}              ${OUT_TMP}/kernel
-      Run Process               ln  -sfr  ${SEL4TEST_WRAPPER_ROOTSERVER}          ${OUT_TMP}/capdl-loader
+      Run Process               mkdir  -p  ${OUT_TMP}
+      Run Process               cp  -f  ${MATCHA_BUNDLE_RELEASE}  ${OUT_TMP}/matcha-tock-bundle
+      Run Process               riscv32-unknown-elf-strip  ${OUT_TMP}/matcha-tock-bundle
+      Run Process               riscv32-unknown-elf-objcopy  -O  binary  -g  ${OUT_TMP}/matcha-tock-bundle  ${OUT_TMP}/matcha-tock-bundle.bin
+      Run Process               ln  -sfr  ${SEL4TEST_WRAPPER_KERNEL}       ${OUT_TMP}/kernel
+      Run Process               ln  -sfr  ${SEL4TEST_WRAPPER_ROOTSERVER}   ${OUT_TMP}/capdl-loader
       Run Process               tar  -C  ${OUT_TMP}  -cvhf  ${ROOTDIR}/${FLASH_WRAPPER_TAR}  matcha-tock-bundle.bin  kernel  capdl-loader
     ELSE
-      Run Process               ln  -sfr  ${SEL4TEST_KERNEL}              ${OUT_TMP}/kernel
-      Run Process               ln  -sfr  ${SEL4TEST_ROOTSERVER}          ${OUT_TMP}/capdl-loader
+      Run Process               mkdir  -p  ${OUT_TMP}
+      Run Process               cp  -f  ${MATCHA_BUNDLE_RELEASE}  ${OUT_TMP}/matcha-tock-bundle
+      Run Process               riscv32-unknown-elf-strip  ${OUT_TMP}/matcha-tock-bundle
+      Run Process               riscv32-unknown-elf-objcopy  -O  binary  -g  ${OUT_TMP}/matcha-tock-bundle  ${OUT_TMP}/matcha-tock-bundle.bin
+      Run Process               ln  -sfr  ${SEL4TEST_KERNEL}       ${OUT_TMP}/kernel
+      Run Process               ln  -sfr  ${SEL4TEST_ROOTSERVER}   ${OUT_TMP}/capdl-loader
       Run Process               tar  -C  ${OUT_TMP}  -cvhf  ${ROOTDIR}/${FLASH_TAR}  matcha-tock-bundle.bin  kernel  capdl-loader
     END
     Provides                    initialization
diff --git a/shodan_stress.robot b/shodan_stress.robot
index 0b96c76..d42ae08 100644
--- a/shodan_stress.robot
+++ b/shodan_stress.robot
@@ -11,13 +11,13 @@
 ${UART5}                         sysbus.uart5
 
 ${MATCHA_BUNDLE_RELEASE}         ${ROOTDIR}/out/matcha-bundle-release.elf
-${CANTRIP_KERNEL_RELEASE}        ${ROOTDIR}/out/cantrip/riscv32-unknown-elf/release/kernel/kernel.elf
-${CANTRIP_ROOTSERVER_RELEASE}    ${ROOTDIR}/out/cantrip/riscv32-unknown-elf/release/capdl-loader
+${CANTRIP_KERNEL_RELEASE}        ${ROOTDIR}/out/cantrip/shodan/release/kernel/kernel.elf
+${CANTRIP_ROOTSERVER_RELEASE}    ${ROOTDIR}/out/cantrip/shodan/release/capdl-loader
 
 ${OUT_TMP}                       ${ROOTDIR}/out/tmp
 
-${FLASH_RELEASE_TAR}             out/ext_flash_release.tar
-${CPIO_RELEASE}                  out/cantrip/riscv32-unknown-elf/release/ext_builtins.cpio
+${FLASH_RELEASE_TAR}             out/cantrip/shodan/release/ext_flash.tar
+${CPIO_RELEASE}                  out/cantrip/shodan/release/ext_builtins.cpio
 
 *** Keywords ***
 Prepare Machine
@@ -38,8 +38,9 @@
     Wait For Line On Uart       Bundle "${app}" stopped
 
 *** Test Cases ***
+    # NB: must have at least 2x spaces between Run Process arguments!
 Prepare Flash Tarball
-    Run Process                 mkdir  -p    ${ROOTDIR}/out/tmp
+    Run Process                 mkdir  -p    ${OUT_TMP}
     Run Process                 cp     -f  ${MATCHA_BUNDLE_RELEASE}       ${OUT_TMP}/matcha-tock-bundle-release
     Run Process                 riscv32-unknown-elf-strip  ${OUT_TMP}/matcha-tock-bundle-release
     Run Process                 riscv32-unknown-elf-objcopy  -O  binary  -g  ${OUT_TMP}/matcha-tock-bundle-release  ${OUT_TMP}/matcha-tock-bundle.bin