diff --git a/src/device_library.h b/src/device_library.h
index 6481f2af9..95631e347 100644
--- a/src/device_library.h
+++ b/src/device_library.h
@@ -84,11 +84,11 @@
 // Thermostat - Junkers - 0x10
 {105, DeviceType::THERMOSTAT, F("FW100"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS},
 {106, DeviceType::THERMOSTAT, F("FW200"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS},
-{107, DeviceType::THERMOSTAT, F("FR100"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS | DeviceFlags::EMS_DEVICE_FLAG_JUNKERS_2}, // older model
-{108, DeviceType::THERMOSTAT, F("FR110"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS | DeviceFlags::EMS_DEVICE_FLAG_JUNKERS_2}, // older model
+{107, DeviceType::THERMOSTAT, F("FR100"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS | DeviceFlags::EMS_DEVICE_FLAG_JUNKERS_OLD}, // older model
+{108, DeviceType::THERMOSTAT, F("FR110"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS | DeviceFlags::EMS_DEVICE_FLAG_JUNKERS_OLD}, // older model
 {111, DeviceType::THERMOSTAT, F("FR10"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS},  
-{147, DeviceType::THERMOSTAT, F("FR50"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS | DeviceFlags::EMS_DEVICE_FLAG_JUNKERS_2},
-{191, DeviceType::THERMOSTAT, F("FR120"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS | DeviceFlags::EMS_DEVICE_FLAG_JUNKERS_2}, // older model
+{147, DeviceType::THERMOSTAT, F("FR50"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS | DeviceFlags::EMS_DEVICE_FLAG_JUNKERS_OLD},
+{191, DeviceType::THERMOSTAT, F("FR120"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS | DeviceFlags::EMS_DEVICE_FLAG_JUNKERS_OLD}, // older model
 {192, DeviceType::THERMOSTAT, F("FW120"), DeviceFlags::EMS_DEVICE_FLAG_JUNKERS},
 
 // Solar Modules - 0x30
diff --git a/src/emsdevice.h b/src/emsdevice.h
index b2e2589f8..1c35858a2 100644
--- a/src/emsdevice.h
+++ b/src/emsdevice.h
@@ -255,18 +255,18 @@ class EMSdevice {
     static constexpr uint8_t EMS_DEVICE_FLAG_IPM    = 3;
 
     // Thermostats
-    static constexpr uint8_t EMS_DEVICE_FLAG_NO_WRITE  = (1 << 7); // last bit
-    static constexpr uint8_t EMS_DEVICE_FLAG_EASY      = 1;
-    static constexpr uint8_t EMS_DEVICE_FLAG_RC10      = 2;
-    static constexpr uint8_t EMS_DEVICE_FLAG_RC20      = 3;
-    static constexpr uint8_t EMS_DEVICE_FLAG_RC20_2    = 4; // Variation on RC20, Older, like ES72?
-    static constexpr uint8_t EMS_DEVICE_FLAG_RC30_1    = 5; // variation on RC30, Newer?
-    static constexpr uint8_t EMS_DEVICE_FLAG_RC30      = 6;
-    static constexpr uint8_t EMS_DEVICE_FLAG_RC35      = 7;
-    static constexpr uint8_t EMS_DEVICE_FLAG_RC300     = 8;
-    static constexpr uint8_t EMS_DEVICE_FLAG_RC100     = 9;
-    static constexpr uint8_t EMS_DEVICE_FLAG_JUNKERS   = 10;
-    static constexpr uint8_t EMS_DEVICE_FLAG_JUNKERS_2 = (1 << 6); // 6th bit set if older models, like FR120, FR100
+    static constexpr uint8_t EMS_DEVICE_FLAG_NO_WRITE    = (1 << 7); // last bit
+    static constexpr uint8_t EMS_DEVICE_FLAG_JUNKERS_OLD = (1 << 6); // 6th bit set if older models, like FR120, FR100
+    static constexpr uint8_t EMS_DEVICE_FLAG_EASY        = 1;
+    static constexpr uint8_t EMS_DEVICE_FLAG_RC10        = 2;
+    static constexpr uint8_t EMS_DEVICE_FLAG_RC20        = 3;
+    static constexpr uint8_t EMS_DEVICE_FLAG_RC20_2      = 4; // Variation on RC20, Older, like ES72?
+    static constexpr uint8_t EMS_DEVICE_FLAG_RC30_1      = 5; // variation on RC30, Newer?
+    static constexpr uint8_t EMS_DEVICE_FLAG_RC30        = 6;
+    static constexpr uint8_t EMS_DEVICE_FLAG_RC35        = 7;
+    static constexpr uint8_t EMS_DEVICE_FLAG_RC300       = 8;
+    static constexpr uint8_t EMS_DEVICE_FLAG_RC100       = 9;
+    static constexpr uint8_t EMS_DEVICE_FLAG_JUNKERS     = 10;
 
   private:
     uint8_t     unique_id_;