diff --git a/Software/Sender/Sender.ino b/Software/Sender/Sender.ino
index 5d5da10..831371a 100644
--- a/Software/Sender/Sender.ino
+++ b/Software/Sender/Sender.ino
@@ -10,15 +10,16 @@
 #include <SoftRS485.h>
 
 // 0=Test
-// 1=Arbeitszimmer
-// 2=Küche
+// 1=Flur
+// 2=Wohnzimmer
 // 3=Bad
 // 4=Treppenhaus
+// 5=Arbeitszimmer
 
 #define ID 4
 #define PROGRAM "Sender"
-#define VERSION "1.3"
-#define REVISION "2.2"
+#define SW_VERSION "1.3"
+#define HW_VERSION "2.2"
 
 #define BTN_INT 3 // button interrupt pin
 #define Max485_RO 2 // read-output of Max485
@@ -59,7 +60,7 @@ void setup(){
   pinMode(21,INPUT_PULLUP);
 
   attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
-  String s = "{nano:"+String(ID)+",hw:"+REVISION+","+PROGRAM+":"+VERSION+"}";
+  String s = "{nano:"+String(ID)+",hw:"+HW_VERSION+","+PROGRAM+":"+SW_VERSION+"}";
   Serial.println(s);
   send485(s.c_str());
 #ifdef LOG_TO_SERIAL
diff --git a/Software/TempSender/TempSender.ino b/Software/TempSender/TempSender.ino
index 986d485..53bdb40 100644
--- a/Software/TempSender/TempSender.ino
+++ b/Software/TempSender/TempSender.ino
@@ -13,15 +13,16 @@
 #include <AM2302-Sensor.h>
 
 // 0=Test
-// 1=Arbeitszimmer
-// 2=Küche
+// 1=Flur
+// 2=Wohnzimmer
 // 3=Bad
 // 4=Treppenhaus
+// 5=Arbeitszimmer
 
-#define ID 1
+#define ID 5
 #define PROGRAM "TempSender"
-#define VERSION "1.3"
-#define REVISION "2.2"
+#define SW_VERSION "1.3"
+#define HW_VERSION "2.2"
 
 #define BTN_INT 3 // button interrupt pin
 #define Max485_RO 2 // read-output of Max485
@@ -68,7 +69,7 @@ void setup(){
   pinMode(21,INPUT_PULLUP);
 
   attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
-  String s = "{nano:"+String(ID)+",hw:"+REVISION+","+PROGRAM+":"+VERSION+"}";
+  String s = "{nano:"+String(ID)+",hw:"+HW_VERSION+","+PROGRAM+":"+SW_VERSION+"}";
   Serial.println(s);
   send485(s.c_str());
 #ifdef LOG_TO_SERIAL