diff --git a/ESP8266-MQTT-RGBControl/ESP8266-MQTT-RGBControl.h.template b/ESP8266-MQTT-RGBControl/ESP8266-MQTT-RGBControl.h.template
index acaa1de..993bbdf 100644
--- a/ESP8266-MQTT-RGBControl/ESP8266-MQTT-RGBControl.h.template
+++ b/ESP8266-MQTT-RGBControl/ESP8266-MQTT-RGBControl.h.template
@@ -6,7 +6,7 @@ const char* password = "";
 const char* mqtt_server = "broker.mqtt-dashboard.com";
 
 // Device identification
-const char* mqtt_device_name = "esp8266client"
+const char* mqtt_device = "esp8266client"
 
 // MQTT topics
 const char* mqtt_topic_power = "esp8266client/power";
diff --git a/ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5..h.template b/ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5.h.template
similarity index 87%
rename from ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5..h.template
rename to ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5.h.template
index 41d0062..468a63f 100644
--- a/ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5..h.template
+++ b/ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5.h.template
@@ -6,7 +6,7 @@ const char* password = "";
 const char* mqtt_server = "broker.mqtt-dashboard.com";
 
 // Device identification
-const char* mqtt_device_name = "esp8266benq"
+const char* mqtt_device = "esp8266benq"
 
 // MQTT topics
 const char* mqtt_topic_power = "benq/power";
diff --git a/ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5.ino b/ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5.ino
index fea4f83..be54b81 100644
--- a/ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5.ino
+++ b/ESP8266-MQTT-Teufel-DS5/ESP8266-MQTT-Teufel-DS5.ino
@@ -226,7 +226,7 @@ void reconnect() {
       Serial.print("Attempting MQTT connection...");
     }
     // Attempt to connect
-    if (client.connect(mqtt_device_name)) {
+    if (client.connect(mqtt_device)) {
       if (DEBUGTOSERIAL) {
         Serial.println("connected");
       }
diff --git a/ESP8266-MQTT-Teufel-Subwoofer/ESP8266-MQTT-Teufel-Subwoofer.h.template b/ESP8266-MQTT-Teufel-Subwoofer/ESP8266-MQTT-Teufel-Subwoofer.h.template
index c5177ff..6e143b1 100644
--- a/ESP8266-MQTT-Teufel-Subwoofer/ESP8266-MQTT-Teufel-Subwoofer.h.template
+++ b/ESP8266-MQTT-Teufel-Subwoofer/ESP8266-MQTT-Teufel-Subwoofer.h.template
@@ -6,7 +6,7 @@ const char* password = "";
 const char* mqtt_server = "broker.mqtt-dashboard.com";
 
 // Device identification
-const char* mqtt_device_name = "livingroom/teufelSub";
+const char* mqtt_device = "livingroom/teufelSub";
 
 // MQTT topics
 const char* mqtt_topic_power = "livingroom/teufelSub/power";
diff --git a/ESP8266-MQTT-Teufel-Subwoofer/ESP8266-MQTT-Teufel-Subwoofer.ino b/ESP8266-MQTT-Teufel-Subwoofer/ESP8266-MQTT-Teufel-Subwoofer.ino
index c6f4da4..df886a2 100644
--- a/ESP8266-MQTT-Teufel-Subwoofer/ESP8266-MQTT-Teufel-Subwoofer.ino
+++ b/ESP8266-MQTT-Teufel-Subwoofer/ESP8266-MQTT-Teufel-Subwoofer.ino
@@ -156,7 +156,7 @@ void reconnect() {
       Serial.print("Attempting MQTT connection...");
     }
     // Attempt to connect
-    if (client.connect(mqtt_device_name)) {
+    if (client.connect(mqtt_device)) {
       if (DEBUGTOSERIAL) {
         Serial.println("connected");
       }