diff --git a/Devices/btt-panda-touch/Source/module.cpp b/Devices/btt-panda-touch/Source/module.cpp
index fce2c933b..881dd315c 100644
--- a/Devices/btt-panda-touch/Source/module.cpp
+++ b/Devices/btt-panda-touch/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "BigTreeTech Panda Touch / K Touch",
+    .name = "btt-panda-touch",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/cyd-2432s024c/Source/module.cpp b/Devices/cyd-2432s024c/Source/module.cpp
index 24e65e593..bda3f76bd 100644
--- a/Devices/cyd-2432s024c/Source/module.cpp
+++ b/Devices/cyd-2432s024c/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "cyd-2432s024c",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/cyd-2432s028r/Source/module.cpp b/Devices/cyd-2432s028r/Source/module.cpp
index 24e65e593..8d9b5152e 100644
--- a/Devices/cyd-2432s028r/Source/module.cpp
+++ b/Devices/cyd-2432s028r/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "cyd-2432s028r",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/cyd-2432s028rv3/Source/module.cpp b/Devices/cyd-2432s028rv3/Source/module.cpp
index 24e65e593..f36b66271 100644
--- a/Devices/cyd-2432s028rv3/Source/module.cpp
+++ b/Devices/cyd-2432s028rv3/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "cyd-2432s028rv3",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/cyd-2432s032c/Source/module.cpp b/Devices/cyd-2432s032c/Source/module.cpp
index 24e65e593..275f43ca7 100644
--- a/Devices/cyd-2432s032c/Source/module.cpp
+++ b/Devices/cyd-2432s032c/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "cyd-2432s032c",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/cyd-4848s040c/Source/module.cpp b/Devices/cyd-4848s040c/Source/module.cpp
index 24e65e593..3115b3a39 100644
--- a/Devices/cyd-4848s040c/Source/module.cpp
+++ b/Devices/cyd-4848s040c/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "cyd-4848s040c",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/cyd-8048s043c/Source/module.cpp b/Devices/cyd-8048s043c/Source/module.cpp
index 24e65e593..2aeb6a1d0 100644
--- a/Devices/cyd-8048s043c/Source/module.cpp
+++ b/Devices/cyd-8048s043c/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "cyd-8048s043c",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/cyd-e32r28t/Source/module.cpp b/Devices/cyd-e32r28t/Source/module.cpp
index 24e65e593..77a33065a 100644
--- a/Devices/cyd-e32r28t/Source/module.cpp
+++ b/Devices/cyd-e32r28t/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "cyd-e32r28t",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/cyd-e32r32p/Source/module.cpp b/Devices/cyd-e32r32p/Source/module.cpp
index 24e65e593..d63b5ecc1 100644
--- a/Devices/cyd-e32r32p/Source/module.cpp
+++ b/Devices/cyd-e32r32p/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "cyd-e32r32p",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/elecrow-crowpanel-advance-28/Source/module.cpp b/Devices/elecrow-crowpanel-advance-28/Source/module.cpp
index 24e65e593..edd412fab 100644
--- a/Devices/elecrow-crowpanel-advance-28/Source/module.cpp
+++ b/Devices/elecrow-crowpanel-advance-28/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "elecrow-crowpanel-advance-28",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/elecrow-crowpanel-advance-35/Source/module.cpp b/Devices/elecrow-crowpanel-advance-35/Source/module.cpp
index 24e65e593..0beb3267e 100644
--- a/Devices/elecrow-crowpanel-advance-35/Source/module.cpp
+++ b/Devices/elecrow-crowpanel-advance-35/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "elecrow-crowpanel-advance-35",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/elecrow-crowpanel-advance-50/Source/module.cpp b/Devices/elecrow-crowpanel-advance-50/Source/module.cpp
index 24e65e593..b10c01afb 100644
--- a/Devices/elecrow-crowpanel-advance-50/Source/module.cpp
+++ b/Devices/elecrow-crowpanel-advance-50/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "elecrow-crowpanel-advance-50",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/elecrow-crowpanel-basic-28/Source/module.cpp b/Devices/elecrow-crowpanel-basic-28/Source/module.cpp
index 24e65e593..e502d9abc 100644
--- a/Devices/elecrow-crowpanel-basic-28/Source/module.cpp
+++ b/Devices/elecrow-crowpanel-basic-28/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "elecrow-crowpanel-basic-28",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/elecrow-crowpanel-basic-35/Source/module.cpp b/Devices/elecrow-crowpanel-basic-35/Source/module.cpp
index 24e65e593..36c9fe1a5 100644
--- a/Devices/elecrow-crowpanel-basic-35/Source/module.cpp
+++ b/Devices/elecrow-crowpanel-basic-35/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "elecrow-crowpanel-basic-35",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/elecrow-crowpanel-basic-50/Source/module.cpp b/Devices/elecrow-crowpanel-basic-50/Source/module.cpp
index 24e65e593..43c317b22 100644
--- a/Devices/elecrow-crowpanel-basic-50/Source/module.cpp
+++ b/Devices/elecrow-crowpanel-basic-50/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "elecrow-crowpanel-basic-50",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/generic-esp32/Source/module.cpp b/Devices/generic-esp32/Source/module.cpp
index 24e65e593..fba222d8e 100644
--- a/Devices/generic-esp32/Source/module.cpp
+++ b/Devices/generic-esp32/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "generic-esp32",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/generic-esp32c6/Source/module.cpp b/Devices/generic-esp32c6/Source/module.cpp
index 24e65e593..640d73013 100644
--- a/Devices/generic-esp32c6/Source/module.cpp
+++ b/Devices/generic-esp32c6/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "generic-esp32c6",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/generic-esp32p4/Source/module.cpp b/Devices/generic-esp32p4/Source/module.cpp
index 24e65e593..fc7b8065f 100644
--- a/Devices/generic-esp32p4/Source/module.cpp
+++ b/Devices/generic-esp32p4/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "generic-esp32p4",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/generic-esp32s3/Source/module.cpp b/Devices/generic-esp32s3/Source/module.cpp
index 24e65e593..514cb7202 100644
--- a/Devices/generic-esp32s3/Source/module.cpp
+++ b/Devices/generic-esp32s3/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "generic-esp32s3",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/guition-jc1060p470ciwy/Source/module.cpp b/Devices/guition-jc1060p470ciwy/Source/module.cpp
index 24e65e593..3ad541c3d 100644
--- a/Devices/guition-jc1060p470ciwy/Source/module.cpp
+++ b/Devices/guition-jc1060p470ciwy/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "guition-jc1060p470ciwy",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/guition-jc2432w328c/Source/module.cpp b/Devices/guition-jc2432w328c/Source/module.cpp
index 24e65e593..f13f64d34 100644
--- a/Devices/guition-jc2432w328c/Source/module.cpp
+++ b/Devices/guition-jc2432w328c/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "guition-jc2432w328c",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/guition-jc3248w535c/Source/module.cpp b/Devices/guition-jc3248w535c/Source/module.cpp
index 24e65e593..e56afa25a 100644
--- a/Devices/guition-jc3248w535c/Source/module.cpp
+++ b/Devices/guition-jc3248w535c/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "guition-jc3248w535c",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/guition-jc8048w550c/Source/module.cpp b/Devices/guition-jc8048w550c/Source/module.cpp
index 24e65e593..674795f66 100644
--- a/Devices/guition-jc8048w550c/Source/module.cpp
+++ b/Devices/guition-jc8048w550c/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "guition-jc8048w550c",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/heltec-wifi-lora-32-v3/Source/module.cpp b/Devices/heltec-wifi-lora-32-v3/Source/module.cpp
index 24e65e593..3090a351d 100644
--- a/Devices/heltec-wifi-lora-32-v3/Source/module.cpp
+++ b/Devices/heltec-wifi-lora-32-v3/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "heltec-wifi-lora-32-v3",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/lilygo-tdeck/Source/module.cpp b/Devices/lilygo-tdeck/Source/module.cpp
index cb5780162..adc3efc83 100644
--- a/Devices/lilygo-tdeck/Source/module.cpp
+++ b/Devices/lilygo-tdeck/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "LilyGO T-Deck",
+    .name = "lilygo-tdeck",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/lilygo-tdisplay-s3/Source/module.cpp b/Devices/lilygo-tdisplay-s3/Source/module.cpp
index 24e65e593..c7406140c 100644
--- a/Devices/lilygo-tdisplay-s3/Source/module.cpp
+++ b/Devices/lilygo-tdisplay-s3/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "lilygo-tdisplay-s3",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/lilygo-tdisplay/Source/module.cpp b/Devices/lilygo-tdisplay/Source/module.cpp
index 24e65e593..611e53130 100644
--- a/Devices/lilygo-tdisplay/Source/module.cpp
+++ b/Devices/lilygo-tdisplay/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "lilygo-tdisplay",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/lilygo-tdongle-s3/Source/module.cpp b/Devices/lilygo-tdongle-s3/Source/module.cpp
index 24e65e593..724053d47 100644
--- a/Devices/lilygo-tdongle-s3/Source/module.cpp
+++ b/Devices/lilygo-tdongle-s3/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "lilygo-tdongle-s3",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/lilygo-tlora-pager/Source/module.cpp b/Devices/lilygo-tlora-pager/Source/module.cpp
index 751a133cc..9e4a11640 100644
--- a/Devices/lilygo-tlora-pager/Source/module.cpp
+++ b/Devices/lilygo-tlora-pager/Source/module.cpp
@@ -22,7 +22,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "LilyGO T-Lora Pager",
+    .name = "lilygo-tlora-pager",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/m5stack-cardputer-adv/Source/module.cpp b/Devices/m5stack-cardputer-adv/Source/module.cpp
index 24e65e593..8d36c48a0 100644
--- a/Devices/m5stack-cardputer-adv/Source/module.cpp
+++ b/Devices/m5stack-cardputer-adv/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "m5stack-cardputer-adv",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/m5stack-cardputer/Source/module.cpp b/Devices/m5stack-cardputer/Source/module.cpp
index 24e65e593..61536878a 100644
--- a/Devices/m5stack-cardputer/Source/module.cpp
+++ b/Devices/m5stack-cardputer/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "m5stack-cardputer",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/m5stack-core2/Source/module.cpp b/Devices/m5stack-core2/Source/module.cpp
index 24e65e593..1caed8e51 100644
--- a/Devices/m5stack-core2/Source/module.cpp
+++ b/Devices/m5stack-core2/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "m5stack-core2",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/m5stack-cores3/Source/module.cpp b/Devices/m5stack-cores3/Source/module.cpp
index 24e65e593..0d9f25d81 100644
--- a/Devices/m5stack-cores3/Source/module.cpp
+++ b/Devices/m5stack-cores3/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "m5stack-cores3",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/m5stack-stickc-plus/Source/module.cpp b/Devices/m5stack-stickc-plus/Source/module.cpp
index 24e65e593..624582a2d 100644
--- a/Devices/m5stack-stickc-plus/Source/module.cpp
+++ b/Devices/m5stack-stickc-plus/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "m5stack-stickc-plus",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/m5stack-stickc-plus2/Source/module.cpp b/Devices/m5stack-stickc-plus2/Source/module.cpp
index 24e65e593..cc73feb1c 100644
--- a/Devices/m5stack-stickc-plus2/Source/module.cpp
+++ b/Devices/m5stack-stickc-plus2/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "m5stack-stickc-plus2",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/m5stack-tab5/Source/module.cpp b/Devices/m5stack-tab5/Source/module.cpp
index 24e65e593..def51dc4e 100644
--- a/Devices/m5stack-tab5/Source/module.cpp
+++ b/Devices/m5stack-tab5/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "m5stack-tab5",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/simulator/Source/module.cpp b/Devices/simulator/Source/module.cpp
index 24e65e593..88303c1d3 100644
--- a/Devices/simulator/Source/module.cpp
+++ b/Devices/simulator/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "simulator",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/unphone/Source/module.cpp b/Devices/unphone/Source/module.cpp
index 24e65e593..fc2fbf09b 100644
--- a/Devices/unphone/Source/module.cpp
+++ b/Devices/unphone/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "unphone",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/waveshare-esp32-s3-geek/Source/module.cpp b/Devices/waveshare-esp32-s3-geek/Source/module.cpp
index 24e65e593..14b283c50 100644
--- a/Devices/waveshare-esp32-s3-geek/Source/module.cpp
+++ b/Devices/waveshare-esp32-s3-geek/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "waveshare-esp32-s3-geek",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/waveshare-s3-lcd-13/Source/module.cpp b/Devices/waveshare-s3-lcd-13/Source/module.cpp
index 24e65e593..6b6a72bbb 100644
--- a/Devices/waveshare-s3-lcd-13/Source/module.cpp
+++ b/Devices/waveshare-s3-lcd-13/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "waveshare-s3-lcd-13",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/waveshare-s3-touch-lcd-128/Source/module.cpp b/Devices/waveshare-s3-touch-lcd-128/Source/module.cpp
index 24e65e593..e33f32c7f 100644
--- a/Devices/waveshare-s3-touch-lcd-128/Source/module.cpp
+++ b/Devices/waveshare-s3-touch-lcd-128/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "waveshare-s3-touch-lcd-128",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/waveshare-s3-touch-lcd-147/Source/module.cpp b/Devices/waveshare-s3-touch-lcd-147/Source/module.cpp
index 24e65e593..c0df6f143 100644
--- a/Devices/waveshare-s3-touch-lcd-147/Source/module.cpp
+++ b/Devices/waveshare-s3-touch-lcd-147/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "waveshare-s3-touch-lcd-147",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/waveshare-s3-touch-lcd-43/Source/module.cpp b/Devices/waveshare-s3-touch-lcd-43/Source/module.cpp
index 24e65e593..7dcec5f19 100644
--- a/Devices/waveshare-s3-touch-lcd-43/Source/module.cpp
+++ b/Devices/waveshare-s3-touch-lcd-43/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "waveshare-s3-touch-lcd-43",
     .start = start,
     .stop = stop
 };
diff --git a/Devices/wireless-tag-wt32-sc01-plus/Source/module.cpp b/Devices/wireless-tag-wt32-sc01-plus/Source/module.cpp
index 24e65e593..8fa863c70 100644
--- a/Devices/wireless-tag-wt32-sc01-plus/Source/module.cpp
+++ b/Devices/wireless-tag-wt32-sc01-plus/Source/module.cpp
@@ -14,7 +14,7 @@ static error_t stop() {
 
 /** @warning The variable name must be exactly "device_module" */
 struct Module device_module = {
-    .name = "Module",
+    .name = "wireless-tag-wt32-sc01-plus",
     .start = start,
     .stop = stop
 };