diff --git a/arduino/sonoffliving/sonoffliving.cpp b/arduino/sonoffliving/sonoffliving.cpp
index 031dc37..f830db3 100644
--- a/arduino/sonoffliving/sonoffliving.cpp
+++ b/arduino/sonoffliving/sonoffliving.cpp
@@ -114,7 +114,7 @@ void testConnectMQTT()
 {
   while (!client.connected()) {
     Debug.print("Connexion au serveur MQTT... ");
-    if (client.connect("ESP8266Client", MQTT_USER, MQTT_PASS)) {
+    if (client.connect(MQTT_CLIENT, MQTT_USER, MQTT_PASS)) {
       Debug.print("OK\nSend Current State");
       mqttSendState();
 
diff --git a/arduino/sonoffliving/sonoffliving.example.h b/arduino/sonoffliving/sonoffliving.example.h
index bb3c5df..09ab095 100644
--- a/arduino/sonoffliving/sonoffliving.example.h
+++ b/arduino/sonoffliving/sonoffliving.example.h
@@ -2,10 +2,11 @@
 
 // OTA
 #define OTA_PASSWORD "XXX"
+// Ce nom est réutillisé par la suite pour le RemoteDebug + MQTT
 #define OTA_CLIENT "sonoff_living"
 
 // DebugRemote
-#define REMDEB_CLIENT "sonoff_living"
+#define REMDEB_CLIENT OTA_CLIENT
 RemoteDebug Debug;
 
 // WIFI
@@ -14,9 +15,9 @@ RemoteDebug Debug;
 
 WiFiClient espClient;
 
-#define BUTTON 0
-#define RELAY  12
-#define LED    13
+#define BUTTON_PIN 0
+#define RELAY_PIN  12
+#define LED_PIN    13
 
 // MQTT
 #define MQTT_SERVER     "XXX"
@@ -24,9 +25,9 @@ WiFiClient espClient;
 #define MQTT_USER       "XXX"
 #define MQTT_PASS       "XXX"
 
-#define MQTT_CLIENT  "sonoff_living"
-#define MQTT_COMMAND "sonoff_living/switch"
-#define MQTT_STATE   "sonoff_living/status"
+#define MQTT_CLIENT  OTA_CLIENT
+#define MQTT_COMMAND MQTT_CLIENT"/switch"
+#define MQTT_STATE   MQTT_CLIENT"/status"
 
 char message_buff[100];
 PubSubClient client(espClient);