diff --git a/gateway/include/devices.h b/gateway/include/devices.h
index 33efd72..37ce2b2 100644
--- a/gateway/include/devices.h
+++ b/gateway/include/devices.h
@@ -58,7 +58,7 @@ struct PollinSwitch : Switch {
     const char* group;
     unsigned char channel;
 
-    PollinSwitch(const char* name, const char* group, const unsigned char channel, const char* area = nullptr)
+    PollinSwitch(const char* group, const unsigned char channel, const char* name = nullptr, const char* area = nullptr)
         : Switch(nullptr, [group, channel]{
                 // copy id from string into a new pointer, to avoid memory leaks
                 string s = Protocol_1::buildId(group, channel);
@@ -124,11 +124,11 @@ Command* commands[] = {
     .build(),
     new EasyHomeSwitch{"FritzBox", "easy_home_a", (unsigned long[4]) { 4483136, 4626800, 4661552, 4819632 }, (unsigned long[4]) { 4326544, 4537104, 4767520, 4972704 }, "Basement"},
     new EasyHomeSwitch{"Outside", "easy_home_b", (unsigned long[4]) { 4483140, 4626804, 4661556, 4819636 }, (unsigned long[4]) { 4326548, 4537108, 4767524, 4972708 }, "Basement"},
-    new PollinSwitch{"Meeting sensor", "00001", 1, "Dining room"},
-    new PollinSwitch{"Fire Tv", "00001", 2, "Living room"},
-    new PollinSwitch{"Diningroom player", "00001", 3, "Dining room"},
-    new PollinSwitch{"Bedroom player", "00001", 4, "Bedroom"},
-    new PollinSwitch{"Train", "11111", 4, "Playroom"}
+    new PollinSwitch{"00001", 1, "Meeting sensor", "Dining room"},
+    new PollinSwitch{"00001", 2, "Fire Tv", "Living room"},
+    new PollinSwitch{"00001", 3, "Diningroom player", "Dining room"},
+    new PollinSwitch{"00001", 4, "Bedroom player", "Bedroom"},
+    new PollinSwitch{"11111", 4, "Train", "Playroom"}
 };
 
 Sensor* sensors[] = {