diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index cd4648e2..b2e095ff 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -265,8 +265,8 @@
 
 #elif defined(AI_LIGHT)
 
-    #define MANUFACTURER        "AI THINKER"
-    #define DEVICE              "AI LIGHT"
+    #define MANUFACTURER        "AI_THINKER"
+    #define DEVICE              "AI_LIGHT"
     #define RELAY_PROVIDER      RELAY_PROVIDER_LIGHT
     #define LIGHT_PROVIDER      LIGHT_PROVIDER_MY9192
 
@@ -276,8 +276,8 @@
 
 #elif defined(LED_CONTROLLER)
 
-    #define MANUFACTURER        "MAGIC HOME"
-    #define DEVICE              "LED CONTROLLER"
+    #define MANUFACTURER        "MAGIC_HOME"
+    #define DEVICE              "LED_CONTROLLER"
     #define LED1_PIN            2
     #define LED1_PIN_INVERSE    1
     #define RELAY_PROVIDER      RELAY_PROVIDER_LIGHT