diff --git a/src/kaleidoscope/device/ATmega32U4Keyboard.h b/src/kaleidoscope/device/ATmega32U4Keyboard.h
index 2570a859..c769cf32 100644
--- a/src/kaleidoscope/device/ATmega32U4Keyboard.h
+++ b/src/kaleidoscope/device/ATmega32U4Keyboard.h
@@ -27,16 +27,17 @@
 #include "kaleidoscope/driver/storage/ATmega32U4EEPROMProps.h"
 #include "kaleidoscope/driver/storage/AVREEPROM.h"
 
-#define ATMEGA32U4_DEVICE_PROPS(BOARD_, BOOTLOADER_, ROW_PINS_, COL_PINS_)     \
-  struct BOARD_##Props : kaleidoscope::device::ATmega32U4KeyboardProps {       \
-    struct KeyScannerProps                                                     \
-       : public kaleidoscope::driver::keyscanner::ATmegaProps                  \
-    {                                                                          \
-      ATMEGA_KEYSCANNER_PROPS(ROW_PIN_LIST(ROW_PINS_),                         \
-                              COL_PIN_LIST(COL_PINS_));                        \
-    };                                                                         \
-    typedef kaleidoscope::driver::keyscanner::ATmega<KeyScannerProps> KeyScanner;\
-    typedef kaleidoscope::driver::bootloader::avr::BOOTLOADER_ BootLoader;     \
+#define ATMEGA32U4_DEVICE_PROPS(BOARD_, BOOTLOADER_, NAME_, ROW_PINS_, COL_PINS_) \
+  struct BOARD_##Props : kaleidoscope::device::ATmega32U4KeyboardProps {          \
+    struct KeyScannerProps                                                        \
+       : public kaleidoscope::driver::keyscanner::ATmegaProps                     \
+    {                                                                             \
+      ATMEGA_KEYSCANNER_PROPS(ROW_PIN_LIST(ROW_PINS_),                            \
+                              COL_PIN_LIST(COL_PINS_));                           \
+    };                                                                            \
+    typedef kaleidoscope::driver::keyscanner::ATmega<KeyScannerProps> KeyScanner; \
+    typedef kaleidoscope::driver::bootloader::avr::BOOTLOADER_ BootLoader;        \
+    static constexpr const char *short_name = NAME_;                             \
   };
 
 #define ATMEGA32U4_DEVICE(BOARD_)                                              \
@@ -46,15 +47,15 @@
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#define ATMEGA32U4_KEYBOARD(BOARD_, BOOTLOADER_, ROW_PINS_, COL_PINS_)         \
-  ATMEGA32U4_DEVICE_PROPS(BOARD_, BOOTLOADER_,                                 \
+#define ATMEGA32U4_KEYBOARD(BOARD_, BOOTLOADER_, NAME_, ROW_PINS_, COL_PINS_)  \
+  ATMEGA32U4_DEVICE_PROPS(BOARD_, BOOTLOADER_, NAME_,                          \
                           FORWARD(ROW_PINS_), FORWARD(COL_PINS_))              \
   ATMEGA32U4_DEVICE(BOARD_)
 
 #else // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#define ATMEGA32U4_KEYBOARD(BOARD_, BOOTLOADER_, ROW_PINS_, COL_PINS_)         \
-  ATMEGA32U4_DEVICE_PROPS(BOARD_, BOOTLOADER_,                                 \
+#define ATMEGA32U4_KEYBOARD(BOARD_, BOOTLOADER_, NAME_, ROW_PINS_, COL_PINS_)  \
+  ATMEGA32U4_DEVICE_PROPS(BOARD_, BOOTLOADER_, NAME_,                          \
                           FORWARD(ROW_PINS_), FORWARD(COL_PINS_))              \
   /* Device definition omitted for virtual device builds.                      \
    * We need to forward declare the device name, though, as there are          \
diff --git a/src/kaleidoscope/device/dygma/Raise.h b/src/kaleidoscope/device/dygma/Raise.h
index 1edfbced..f07dbcde 100644
--- a/src/kaleidoscope/device/dygma/Raise.h
+++ b/src/kaleidoscope/device/dygma/Raise.h
@@ -170,6 +170,7 @@ struct RaiseProps : kaleidoscope::device::BaseProps {
 
   typedef RaiseSideFlasherProps SideFlasherProps;
   typedef kaleidoscope::util::flasher::KeyboardioI2CBootloader<SideFlasherProps> SideFlasher;
+  static constexpr const char *short_name = "raise";
 };
 
 class Raise: public kaleidoscope::device::Base<RaiseProps> {
diff --git a/src/kaleidoscope/device/ez/ErgoDox.h b/src/kaleidoscope/device/ez/ErgoDox.h
index c706b27f..ab9d7ccd 100644
--- a/src/kaleidoscope/device/ez/ErgoDox.h
+++ b/src/kaleidoscope/device/ez/ErgoDox.h
@@ -53,6 +53,7 @@ struct ErgoDoxProps : public kaleidoscope::device::ATmega32U4KeyboardProps {
     KEYSCANNER_PROPS(14, 6);
   };
   typedef kaleidoscope::driver::bootloader::avr::HalfKay Bootloader;
+  static constexpr const char *short_name = "ErgoDox-EZ";
 };
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
diff --git a/src/kaleidoscope/device/kbdfans/KBD4x.h b/src/kaleidoscope/device/kbdfans/KBD4x.h
index d5d83d37..02726e85 100644
--- a/src/kaleidoscope/device/kbdfans/KBD4x.h
+++ b/src/kaleidoscope/device/kbdfans/KBD4x.h
@@ -40,6 +40,7 @@ struct KBD4xProps : kaleidoscope::device::ATmega32U4KeyboardProps {
   };
   typedef kaleidoscope::driver::keyscanner::ATmega<KeyScannerProps> KeyScanner;
   typedef kaleidoscope::driver::bootloader::avr::FLIP Bootloader;
+  static constexpr const char *short_name = "kbd4x";
 };
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
diff --git a/src/kaleidoscope/device/keyboardio/Imago.h b/src/kaleidoscope/device/keyboardio/Imago.h
index 03ff9337..b6801ede 100644
--- a/src/kaleidoscope/device/keyboardio/Imago.h
+++ b/src/kaleidoscope/device/keyboardio/Imago.h
@@ -84,6 +84,7 @@ struct ImagoProps : kaleidoscope::device::ATmega32U4KeyboardProps {
   typedef ImagoLEDDriverProps LEDDriverProps;
   typedef ImagoLEDDriver LEDDriver;
   typedef kaleidoscope::driver::bootloader::avr::Caterina BootLoader;
+  static constexpr const char *short_name = "imago";
 };
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
diff --git a/src/kaleidoscope/device/keyboardio/Model01.h b/src/kaleidoscope/device/keyboardio/Model01.h
index ceac5c5d..91d47a8d 100644
--- a/src/kaleidoscope/device/keyboardio/Model01.h
+++ b/src/kaleidoscope/device/keyboardio/Model01.h
@@ -120,6 +120,7 @@ struct Model01Props : public kaleidoscope::device::ATmega32U4KeyboardProps {
   typedef Model01KeyScannerProps KeyScannerProps;
   typedef Model01KeyScanner KeyScanner;
   typedef kaleidoscope::driver::bootloader::avr::Caterina BootLoader;
+  static constexpr const char *short_name = "kbio01";
 };
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
diff --git a/src/kaleidoscope/device/olkb/Planck.h b/src/kaleidoscope/device/olkb/Planck.h
index c56e16b6..497276ef 100644
--- a/src/kaleidoscope/device/olkb/Planck.h
+++ b/src/kaleidoscope/device/olkb/Planck.h
@@ -29,7 +29,7 @@ namespace device {
 namespace olkb {
 
 ATMEGA32U4_KEYBOARD(
-  Planck, HalfKay,
+  Planck, HalfKay, "planck",
   ROW_PIN_LIST({ PIN_D0, PIN_D5, PIN_B5, PIN_B6 }),
   COL_PIN_LIST({ PIN_F1, PIN_F0, PIN_B0, PIN_C7, PIN_F4, PIN_F5, PIN_F6, PIN_F7, PIN_D4, PIN_D6, PIN_B4, PIN_D7 })
 );
diff --git a/src/kaleidoscope/device/softhruf/Splitography.h b/src/kaleidoscope/device/softhruf/Splitography.h
index 230ace30..d1f9d66e 100644
--- a/src/kaleidoscope/device/softhruf/Splitography.h
+++ b/src/kaleidoscope/device/softhruf/Splitography.h
@@ -47,6 +47,7 @@ struct SplitographyProps : kaleidoscope::device::ATmega32U4KeyboardProps {
   };
   typedef kaleidoscope::driver::keyscanner::ATmega<KeyScannerProps> KeyScanner;
   typedef kaleidoscope::driver::bootloader::avr::FLIP BootLoader;
+  static constexpr const char *short_name = "splitography";
 };
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
diff --git a/src/kaleidoscope/device/technomancy/Atreus.h b/src/kaleidoscope/device/technomancy/Atreus.h
index eda6fac4..a25855a1 100644
--- a/src/kaleidoscope/device/technomancy/Atreus.h
+++ b/src/kaleidoscope/device/technomancy/Atreus.h
@@ -36,7 +36,7 @@ namespace device {
 namespace technomancy {
 
 ATMEGA32U4_KEYBOARD(
-  Atreus, HalfKay,
+  Atreus, HalfKay, "atreus",
 #ifdef KALEIDOSCOPE_HARDWARE_ATREUS_PINOUT_ASTAR
   ROW_PIN_LIST({PIN_D0, PIN_D1, PIN_D3, PIN_D2}),
   COL_PIN_LIST({PIN_D7, PIN_C6, PIN_B5, PIN_B4, PIN_E6, PIN_D4, PIN_B6, PIN_F6, PIN_F7, PIN_D6, PIN_B7})
diff --git a/src/kaleidoscope/device/technomancy/Atreus2.h b/src/kaleidoscope/device/technomancy/Atreus2.h
index c9eaa4f6..2cc0a222 100644
--- a/src/kaleidoscope/device/technomancy/Atreus2.h
+++ b/src/kaleidoscope/device/technomancy/Atreus2.h
@@ -30,7 +30,7 @@ namespace device {
 namespace technomancy {
 
 ATMEGA32U4_KEYBOARD(
-  Atreus2, Caterina,
+  Atreus2, Caterina, "atreus",
   ROW_PIN_LIST({PIN_F6, PIN_F5, PIN_F4, PIN_F1}),
   COL_PIN_LIST({PIN_F7, PIN_E2, PIN_C7, PIN_C6, PIN_B6, PIN_B5, PIN_D7, PIN_D6, PIN_D4, PIN_D5, PIN_D3, PIN_D2})
 );