diff --git a/devices.py b/devices.py
index 926db42..c381f09 100644
--- a/devices.py
+++ b/devices.py
@@ -66,8 +66,10 @@ class base(dict):
             for i in range(1, num + 1):
                 device_topic = topic + '_%d' % i
                 dg.append(get_device(dty, mqtt_client, device_topic))
-            self[topic] = devices.group(*dg)
+            this_device = devices.group(*dg)
+            self[topic] = this_device
             logger.debug("Added a devicegroup type=%s, topic=%s", dty, topic + '_<num>')
+        return this_device
 
     def get(self, stg, loc, roo, fun):
         """Method to get a device
@@ -93,6 +95,14 @@ class base(dict):
         return self.get(getattr(props, stg), getattr(props, loc), getattr(props, roo), getattr(props, fun))
 
 
+def set_name(d, key, name):
+    try:
+        key = getattr(d, key)
+        d.set_name(key, name)
+    except:
+        print("Unable to set name for %s" % name)
+
+
 class physical_devices(base):
     """
     Class to create and store physical smarthome devices
@@ -112,127 +122,196 @@ class physical_devices(base):
         # MARION
         roo = props.ROO_MAR
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_WIL, props.DTY_TLI_SBT)            # Tradfri Windowlight
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (gfw.marion)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (gfw.marion)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_WIL, props.DTY_TLI_SBT)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Windowlight (gfw.marion)")
 
         # FLOOR
         roo = props.ROO_FLO
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_MAL, props.DTY_LLI_SBT, 2)         # Tradfri Main Light
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (gfw.floor)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_MAL, props.DTY_LLI_SBT, 2)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Main Light (gfw.floor)")
 
         # DIRK
         roo = props.ROO_DIR
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)            # Tradfri Main Light
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_INP, props.DTY_TIN_5xx)            # Tradfri Input Device 5 Buttons
-        self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_MPP, props.DTY_MPP_4xx)            # My 4 port Powerplug
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_DEL, props.DTY_TLI_SBT)            # Tradfri Desklight
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_DCK, props.DTY_SPP_SW1)            # Tradfri 1 port Powerplug
-        self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_RCA, props.DTY_MRE_xxx)            # Remote Control IR Amplifier
-        self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_ASS, props.DTY_MAS_xxx)            # Audio status Spotify
-        self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_ASM, props.DTY_MAS_xxx)            # Audio status MPD
-        self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_ASB, props.DTY_MAS_xxx)            # Audio status Bluetooth
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
-        self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_AMB, props.DTY_MAM_THP)            # My Ambient information
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Main Light (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_INP, props.DTY_TIN_5xx)
+        set_name(d, "KEY_INPUT_0", "Tradfri Input Buttons 0 (gfw.dirk)")
+        set_name(d, "KEY_INPUT_1", "Tradfri Input Buttons 1 (gfw.dirk)")
+        set_name(d, "KEY_INPUT_2", "Tradfri Input Buttons 2 (gfw.dirk)")
+        set_name(d, "KEY_INPUT_3", "Tradfri Input Buttons 3 (gfw.dirk)")
+        set_name(d, "KEY_INPUT_4", "Tradfri Input Buttons 4 (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_MPP, props.DTY_MPP_4xx)
+        set_name(d, "KEY_OUTPUT_0", "Amplifier (gfw.dirk)")
+        set_name(d, "KEY_OUTPUT_1", "Phono (gfw.dirk)")
+        set_name(d, "KEY_OUTPUT_2", "CD_Player (gfw.dirk)")
+        set_name(d, "KEY_OUTPUT_3", "Bluetooth (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_DEL, props.DTY_TLI_SBT)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Desklight (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_DCK, props.DTY_SPP_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri 1 port Powerplug (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_RCA, props.DTY_MRE_xxx)
+        # TODO: set_name(d, "KEY_OUTPUT_0", "Remote Control IR Amplifier (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_ASS, props.DTY_MAS_xxx)
+        # TODO: set_name(d, "KEY_OUTPUT_0", "Audio status Spotify (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_ASM, props.DTY_MAS_xxx)
+        # TODO: set_name(d, "KEY_OUTPUT_0", "Audio status MPD (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_ASB, props.DTY_MAS_xxx)
+        # TODO: set_name(d, "KEY_OUTPUT_0", "Audio status Bluetooth (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (gfw.dirk)")
+        d = self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_AMB, props.DTY_MAM_THP)
+        # TODO: set_name(d, "KEY_OUTPUT_0", "My Ambient information (gfw.dirk)")
 
     def __init_gar__(self, mqtt_client):
         loc = props.LOC_GAR
 
         # GARDEN
         roo = props.ROO_GAR
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_GAR, props.DTY_SPP_SW1)            # Powerplugs Garden
-        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_REP, props.DTY_SPP_SW1)            # WiFi Garden
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_GAR, props.DTY_SPP_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Powerplug light (garden)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_REP, props.DTY_SPP_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Powerplug WiFi (garden)")
 
     def __init_ffw__(self, mqtt_client):
         loc = props.LOC_FFW
         # FLOOR
         roo = props.ROO_FLO
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffw.floor)")
 
         # JULIAN
         roo = props.ROO_JUL
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)            # Tradfri Main Light
-        self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffw.hulian)")
+        d = self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Main Light (ffw.hulian)")
+        d = self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (ffw.hulian)")
 
         # BATH
         roo = props.ROO_BAT
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffw.bath)")
+        d = self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (ffw.bath)")
 
         # LIVINGROOM
         roo = props.ROO_LIV
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)            # Tradfri Main Light
-        self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffw.livingroom)")
+        d = self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Main Light (ffw.livingroom)")
+        d = self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (ffw.livingroom)")
 
         # SLEEP
         roo = props.ROO_SLP
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_MAL, props.DTY_TLI_SBx)            # Tradfri Main Light
-        self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
-        self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_WIL, props.DTY_TLI_SBT)            # Tradfri Windowlight
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffw.sleep)")
+        d = self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_MAL, props.DTY_TLI_SBx)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Main Light (ffw.sleep)")
+        d = self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (ffw.sleep)")
+        d = self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_WIL, props.DTY_TLI_SBT)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Windowlight (ffw.sleep)")
 
     def __init_ffe__(self, mqtt_client):
         loc = props.LOC_FFE
         # FLOOR
         roo = props.ROO_FLO
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffe.floor)")
 
         # KITCHEN
         roo = props.ROO_KIT
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_CIR, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_MAL, props.DTY_HLI_SBT, 2)         # Hue Main Light
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffe.kitchen)")
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_CIR, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffe.kitchen)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_MAL, props.DTY_HLI_SBT, 2)
+        set_name(d, "KEY_OUTPUT_0", "Hue Main Light (ffe.kitchen)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (ffe.kitchen)")
 
         # DININGROOM
         roo = props.ROO_DIN
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_FLL, props.DTY_SPP_SW1)            # Powerplug Floor Light
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_GAR, props.DTY_SPP_SW1)            # Powerplug Garland
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffe.diningroom)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_FLL, props.DTY_SPP_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Powerplug Floor Light (ffe.diningroom)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_GAR, props.DTY_SPP_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Powerplug Garland (ffe.diningroom)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (ffe.diningroom)")
 
         # SLEEP
         roo = props.ROO_SLP
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)            # Tradfri Main Light
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_INP, props.DTY_TIN_5xx)            # Tradfri Input Device 5 Buttons
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLD, props.DTY_TLI_SBx)            # Tradfri Bed Light Dirk
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLM, props.DTY_SPP_SW1)            # Powerplug Bed Light Marion
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_WLI, props.DTY_TLI_SBx)            # Tradfri Wardobe light
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffe.sleep)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Main Light (ffe.sleep)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_INP, props.DTY_TIN_5xx)
+        set_name(d, "KEY_INPUT_0", "Tradfri Input Buttons 1 (ffe.sleep)")
+        set_name(d, "KEY_INPUT_1", "Tradfri Input Buttons 2 (ffe.sleep)")
+        set_name(d, "KEY_INPUT_2", "Tradfri Input Buttons 3 (ffe.sleep)")
+        set_name(d, "KEY_INPUT_3", "Tradfri Input Buttons 4 (ffe.sleep)")
+        set_name(d, "KEY_INPUT_4", "Tradfri Input Buttons 5 (ffe.sleep)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLD, props.DTY_TLI_SBx)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Bed Light Dirk (ffe.sleep)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLM, props.DTY_SPP_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Powerplug Bed Light Marion (ffe.sleep)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (ffe.sleep)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_WLI, props.DTY_TLI_SBx)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Wardobe light (ffe.sleep)")
 
         # LIVINGROOM
         roo = props.ROO_LIV
         #
-        self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)            # Tradfri Main Light
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_FLL, props.DTY_TLI_SBT, 6)         # Tradfri Floorlamp
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_XTR, props.DTY_SPP_SW1)            # X-Mas Tree
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_XST, props.DTY_SPP_SW1)            # X-Mas Star
-        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
-        self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_AMB, props.DTY_MAM_THP)            # My Ambient information
+        d = self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (ffe.livingroom)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_MAL, props.DTY_TLI_SBT)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Main Light (ffe.livingroom)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_FLL, props.DTY_TLI_SBT, 6)
+        set_name(d, "KEY_OUTPUT_0", "Tradfri Floorlamp (ffe.livingroom)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_XTR, props.DTY_SPP_SW1)
+        set_name(d, "KEY_OUTPUT_0", "X-Mas Tree (ffe.livingroom)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_XST, props.DTY_SPP_SW1)
+        set_name(d, "KEY_OUTPUT_0", "X-Mas Star (ffe.livingroom)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)
+        set_name(d, "KEY_TEMPERATURE", "Brennenstuhl Heatingvalve (ffe.livingroom)")
+        d = self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_AMB, props.DTY_MAM_THP)
+        # TODO: set_name(d, "KEY_OUTPUT_0", "My Ambient information (ffe.livingroom)")
 
     def __init_stw__(self, mqtt_client):
         loc = props.LOC_STW
         # FLOOR
         #
-        self.add(mqtt_client, props.STG_SHE, loc, props.ROO_STF, props.FUN_MAL, props.DTY_SHY_SW1)  # Shelly Main Light
-        self.add(mqtt_client, props.STG_ZFE, loc, props.ROO_STF, props.FUN_MSE, props.DTY_SMS_xxx)  # Motion Sensor First Floor
-        self.add(mqtt_client, props.STG_ZGW, loc, props.ROO_STG, props.FUN_MSE, props.DTY_SMS_xxx)  # Motion Sensor Ground Floor
+        d = self.add(mqtt_client, props.STG_SHE, loc, props.ROO_STF, props.FUN_MAL, props.DTY_SHY_SW1)
+        set_name(d, "KEY_OUTPUT_0", "Shelly Main Light (stairway)")
+        d = self.add(mqtt_client, props.STG_ZFE, loc, props.ROO_STF, props.FUN_MSE, props.DTY_SMS_xxx)
+        set_name(d, "KEY_INPUT_0", "Motion Sensor First Floor (stairway)")
+        d = self.add(mqtt_client, props.STG_ZGW, loc, props.ROO_STG, props.FUN_MSE, props.DTY_SMS_xxx)
+        set_name(d, "KEY_INPUT_0", "Motion Sensor Ground Floor (stairway)")
 
 
 class videv_devices(base):
diff --git a/topic.py b/topic.py
index 812f8c0..3ca1119 100644
--- a/topic.py
+++ b/topic.py
@@ -51,7 +51,7 @@ STG_MYA = 5
 # LOCation
 #
 LOC_GFW = 1
-""" Grounf floor west """
+""" Ground floor west """
 LOC_GFE = 2
 """ Ground floor east """
 LOC_STW = 3