diff --git a/apps/aqhome-react/units/u_module.c b/apps/aqhome-react/units/u_module.c
index 1a25fba..a8c5b25 100644
--- a/apps/aqhome-react/units/u_module.c
+++ b/apps/aqhome-react/units/u_module.c
@@ -62,11 +62,11 @@ static int _linkFromThisModulesInput(AQHOME_REACT *aqh,
                                      const char *emittingPortName,
                                      const char *receivingUnitName,
                                      const char *receivingPortName);
-static int _linkToModulesOutput(AQHOME_REACT *aqh,
-                                AQHREACT_UNIT *unit,
-                                const char *emittingUnitName,
-                                const char *emittingPortName,
-                                const char *receivingPortName);
+static int _linkToThisModulesOutput(AQHOME_REACT *aqh,
+                                    AQHREACT_UNIT *unit,
+                                    const char *emittingUnitName,
+                                    const char *emittingPortName,
+                                    const char *receivingPortName);
 static int _linkBetweenUnits(AQHOME_REACT *aqh,
                              AQHREACT_UNIT *unit,
                              const char *emittingUnitName,
@@ -82,9 +82,9 @@ static int _linkBetweenUnits(AQHOME_REACT *aqh,
  */
 
 
-/* ------------------------------------------------------------------------------------------------
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  * ModuleProxyDescr
- * ------------------------------------------------------------------------------------------------
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  */
 
 MODULE_PROXY_DESCR *ModuleProxyDescr_new(const char *name, const char *targetObject, const char *targetName)
@@ -135,9 +135,9 @@ MODULE_PROXY_DESCR *ModuleProxyDescr_List_FindByName(const MODULE_PROXY_DESCR_LI
 
 
 
-/* ------------------------------------------------------------------------------------------------
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  * AqHomeReact_UnitModule
- * ------------------------------------------------------------------------------------------------
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  */
 
 AQHREACT_UNIT *AqHomeReact_UnitModule_new(AQHOME_REACT *aqh)
@@ -177,19 +177,15 @@ void _freeData(GWEN_UNUSED void *bp, void *p)
 
 AQHREACT_UNIT *AqHomeReact_UnitModule_fromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *xmlNode)
 {
-  const char *t;
-  const char *id;
   AQHREACT_UNIT *unit;
   AQHREACT_UNIT_MODULE *xunit;
   int rv;
 
-  t=GWEN_XMLNode_GetProperty(xmlNode, "type", NULL);
-  id=GWEN_XMLNode_GetProperty(xmlNode, "id", NULL);
-
   unit=AqHomeReact_UnitModule_new(aqh);
   xunit=(AQHREACT_UNIT_MODULE*)GWEN_INHERIT_GETDATA(AQHREACT_UNIT, AQHREACT_UNIT_MODULE, unit);
-  AQHREACT_Unit_SetName(unit, t);
-  AQHREACT_Unit_SetId(unit, id);
+
+  AQHREACT_Unit_SetName(unit, GWEN_XMLNode_GetProperty(xmlNode, "type", NULL));
+  AQHREACT_Unit_SetId(unit, GWEN_XMLNode_GetProperty(xmlNode, "id", NULL));
 
   _readProxyFromXml(xmlNode, xunit->paramProxyList, "paramdefs", "param", "name", "targetModule", "targetParam");
 
@@ -637,7 +633,7 @@ int _readLinkFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *linkN
   if (strcasecmp(emittingUnitName, ".")==0)
     rv=_linkFromThisModulesInput(aqh, unit, emittingPortName, receivingUnitName, receivingPortName);
   else if (strcasecmp(receivingUnitName, ".")==0)
-    rv=_linkToModulesOutput(aqh, unit, emittingUnitName, emittingPortName, receivingPortName);
+    rv=_linkToThisModulesOutput(aqh, unit, emittingUnitName, emittingPortName, receivingPortName);
   else
     rv=_linkBetweenUnits(aqh, unit, emittingUnitName, emittingPortName, receivingUnitName, receivingPortName);
   if (rv<0) {
@@ -694,11 +690,11 @@ int _linkFromThisModulesInput(AQHOME_REACT *aqh,
 
 
 
-int _linkToModulesOutput(AQHOME_REACT *aqh,
-                         AQHREACT_UNIT *unit,
-                         const char *emittingUnitName,
-                         const char *emittingPortName,
-                         const char *receivingPortName)
+int _linkToThisModulesOutput(AQHOME_REACT *aqh,
+                             AQHREACT_UNIT *unit,
+                             const char *emittingUnitName,
+                             const char *emittingPortName,
+                             const char *receivingPortName)
 {
   AQHREACT_UNIT_MODULE *xunit;
   AQHREACT_UNIT *receivingUnit;