diff --git a/skel/scripts/build.sdcc.app/TopHeader.h b/skel/scripts/build.sdcc.firmware/TopHeader.h
similarity index 100%
rename from skel/scripts/build.sdcc.app/TopHeader.h
rename to skel/scripts/build.sdcc.firmware/TopHeader.h
diff --git a/skel/scripts/build.sdcc.app/TopSource.c b/skel/scripts/build.sdcc.firmware/TopSource.c
similarity index 100%
rename from skel/scripts/build.sdcc.app/TopSource.c
rename to skel/scripts/build.sdcc.firmware/TopSource.c
diff --git a/skel/scripts/build.sdcc.app/build.default b/skel/scripts/build.sdcc.firmware/build.default
similarity index 100%
rename from skel/scripts/build.sdcc.app/build.default
rename to skel/scripts/build.sdcc.firmware/build.default
diff --git a/skel/scripts/build.sdcc.app/build.firmware b/skel/scripts/build.sdcc.firmware/build.firmware
similarity index 94%
rename from skel/scripts/build.sdcc.app/build.firmware
rename to skel/scripts/build.sdcc.firmware/build.firmware
index 8096084..d151ccf 100644
--- a/skel/scripts/build.sdcc.app/build.firmware
+++ b/skel/scripts/build.sdcc.firmware/build.firmware
@@ -14,7 +14,7 @@ then
 
     echo "Building firmware ${@NAME@}..."
 
-    source src/@NAME@/build.monolithic
+    do_cmd source src/@NAME@/build.monolithic || return 1
 
     MODIFIED=0
     for test in ${MONOLITHIC_TESTS} ${SRC}
diff --git a/skel/scripts/build.sdcc.app/build.install b/skel/scripts/build.sdcc.firmware/build.install
similarity index 100%
rename from skel/scripts/build.sdcc.app/build.install
rename to skel/scripts/build.sdcc.firmware/build.install
diff --git a/skel/scripts/build.sdcc.app/build.install-firmware b/skel/scripts/build.sdcc.firmware/build.install-firmware
similarity index 100%
rename from skel/scripts/build.sdcc.app/build.install-firmware
rename to skel/scripts/build.sdcc.firmware/build.install-firmware
diff --git a/skel/scripts/build.sdcc.app/build.monolithic b/skel/scripts/build.sdcc.firmware/build.monolithic
similarity index 100%
rename from skel/scripts/build.sdcc.app/build.monolithic
rename to skel/scripts/build.sdcc.firmware/build.monolithic
diff --git a/skel/scripts/build.sdcc.app/instantiate b/skel/scripts/build.sdcc.firmware/instantiate
similarity index 100%
rename from skel/scripts/build.sdcc.app/instantiate
rename to skel/scripts/build.sdcc.firmware/instantiate