diff --git a/build-lulzbot-firmware.sh b/build-lulzbot-firmware.sh
index a31f7b1f7..994e4f9ac 100755
--- a/build-lulzbot-firmware.sh
+++ b/build-lulzbot-firmware.sh
@@ -28,7 +28,7 @@ TAZ_TOOLHEADS="Tilapia_SingleExtruder Kanyu_Flexystruder Opah_Moarstruder Javeli
 # Prints out a usage summary
 #
 usage() {
-  echo "Usage: $0 [--no-timestamps] [printer_model toolhead_name]"
+  echo "Usage: $0 [-s|--short-names] [--no-timestamps] [printer_model toolhead_name]"
   exit
 }
 
@@ -158,6 +158,10 @@ do
       MAKEOPTS="NO_TIMESTAMP=1"
       shift
       ;;
+    --short-names|-s)
+      SHORTNAMES=1
+      shift
+      ;;
     --*)
       usage
       ;;
@@ -181,4 +185,8 @@ else
   build_for_taz
 fi
 
+if [ $SHORTNAMES ]; then
+  rename 's/Marlin_(.+)_(.+)_(.+)_(.+)_(.+)_(.+).hex/Marlin_$2_$4_$5_$6.hex/' build/*
+fi
+
 build_summary