diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java
index 5d330d415a0b8eda4778da4f3042bed15e6a7eab..58e328b5087a9eddebe3d8b9c121d017f40f5e5d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java
@@ -379,10 +379,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getLnClass() {
-        if( refersToLNodeType != null ) return refersToLNodeType.getLnClass();
         return lnClass;
     }
 
@@ -417,22 +416,19 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetLnClass() {
-        return isSetRefersToLNodeType();
+        return lnClassESet;
     }
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getLnType() {
-        if( refersToLNodeType != null )
-            return refersToLNodeType.getId();
-        else
-            return lnType;
+        return lnType;
     }
 
     /**
@@ -466,10 +462,10 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetLnType() {
-        return isSetRefersToLNodeType();
+        return lnTypeESet;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java
index c857a94d2f79d979f8cde766911cf9445305fb26..6d8c6940ff56b7240bf55dfa0f4205013fd03e9b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java
@@ -241,12 +241,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getApName() {
-        if( isSetRefersToAccessPoint() ) {
-            return getRefersToAccessPoint().getName();
-        }
         return apName;
     }
 
@@ -281,21 +278,18 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetApName() {
-        return isSetRefersToAccessPoint();
+        return apNameESet;
     }
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getIedName() {
-        if( isSetRefersToAccessPoint() ) {
-            return getRefersToAccessPoint().getIED().getName();
-        }
         return iedName;
     }
 
@@ -328,12 +322,12 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated NOT
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetIedName() {
-        return isSetRefersToAccessPoint();
+        return iedNameESet;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java
index 0ccf7b140ae0d1ba0cf11f48d3b643e90f01a40f..7f82dbc547373e8d4bb1b6350058b8a4d1ec560f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java
@@ -194,13 +194,10 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getCbName() {
-        if( isSetRefersToControlWithIEDName() )
-            return getRefersToControlWithIEDName().getName();
-        else
-            return cbName;
+        return cbName;
     }
 
     /**
@@ -234,22 +231,19 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetCbName() {
-        return isSetRefersToControlWithIEDName();
+        return cbNameESet;
     }
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getLdInst() {
-        if( isSetRefersToLDevice() )
-            return getRefersToLDevice().getInst();
-        else
-            return ldInst;
+        return ldInst;
     }
 
     /**
@@ -281,12 +275,12 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated NOT
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetLdInst() {
-        return isSetRefersToLDevice();
+        return ldInstESet;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java
index 6035b2154a9c41d6dc6ed55bd279a55a09ae8d4d..9b2ef5816b4028438e57cb595dfde4971d2be4a7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java
@@ -148,13 +148,10 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getDatSet() {
-        if( isSetRefersToDataSet() )
-            return getRefersToDataSet().getName();
-        else
-            return datSet;
+        return datSet;
     }
 
     /**
@@ -186,12 +183,12 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated NOT
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetDatSet() {
-        return isSetRefersToDataSet();
+        return datSetESet;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java
index ca38544d8f885d93d6c81cb111700bb5cdaeabd7..525230f9814fad69cbe6ccf8f6f73c8b93a4ddc1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java
@@ -196,13 +196,10 @@ public class DOImpl extends DataObjectImpl implements DO {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getType() {
-        if( isSetRefersToDOType() )
-            return getRefersToDOType().getId();
-        else
-            return type;
+        return type;
     }
 
     /**
@@ -236,10 +233,10 @@ public class DOImpl extends DataObjectImpl implements DO {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetType() {
-        return isSetRefersToDOType();
+        return typeESet;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
index 9197ca5d7141da053024acc63eb583a5e7ee1d27..c41ff9f3caf3c27ae14ac4f8bba4d98a640d06c8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
@@ -384,14 +384,10 @@ public class FCDAImpl extends ExplicitLinkResolverImpl implements FCDA {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getDaName() {
-        // TODO: wrong because it does not take into account structured names
-        if( isSetRefersToDataAttribute() )
-            return getRefersToDataAttribute().getName();
-        else
-            return daName;
+        return daName;
     }
 
     /**
@@ -423,25 +419,21 @@ public class FCDAImpl extends ExplicitLinkResolverImpl implements FCDA {
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated NOT
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetDaName() {
-        return isSetRefersToDataAttribute();
+        return daNameESet;
     }
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getDoName() {
-        // TODO: wrong because it does not take into account structured names
-        if( isSetRefersToDataObject() )
-            return getRefersToDataObject().getName();
-        else
-            return doName;
+        return doName;
     }
 
     /**
@@ -473,12 +465,12 @@ public class FCDAImpl extends ExplicitLinkResolverImpl implements FCDA {
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated NOT
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetDoName() {
-        return isSetRefersToDataObject();
+        return doNameESet;
     }
 
     /**
@@ -622,13 +614,10 @@ public class FCDAImpl extends ExplicitLinkResolverImpl implements FCDA {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getLnClass() {
-        if( isSetRefersToAnyLN() )
-            return getRefersToAnyLN().getLnClass();
-        else
-            return lnClass;
+        return lnClass;
     }
 
     /**
@@ -660,24 +649,21 @@ public class FCDAImpl extends ExplicitLinkResolverImpl implements FCDA {
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated NOT
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetLnClass() {
-        return isSetRefersToAnyLN();
+        return lnClassESet;
     }
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getLnInst() {
-        if( isSetRefersToAnyLN() )
-            return getRefersToAnyLN().getInst();
-        else
-            return lnInst;
+        return lnInst;
     }
 
     /**
@@ -711,10 +697,10 @@ public class FCDAImpl extends ExplicitLinkResolverImpl implements FCDA {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetLnInst() {
-        return isSetRefersToAnyLN();
+        return lnInstESet;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java
index a6b1e4054e46df29b066c23547cae5c4cbd58247..3e60479a99339015b307da78bb84a06958b7d788 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java
@@ -151,12 +151,9 @@ public class KDCImpl extends ExplicitLinkResolverImpl implements KDC {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getApName() {
-        if( isSetRefersToAccessPoint() ) {
-            return getRefersToAccessPoint().getName();
-        }
         return apName;
     }
 
@@ -191,21 +188,18 @@ public class KDCImpl extends ExplicitLinkResolverImpl implements KDC {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetApName() {
-        return isSetRefersToAccessPoint();
+        return apNameESet;
     }
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getIedName() {
-        if( isSetRefersToAccessPoint() ) {
-            return getRefersToAccessPoint().getIED().getName();
-        }
         return iedName;
     }
 
@@ -240,10 +234,10 @@ public class KDCImpl extends ExplicitLinkResolverImpl implements KDC {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetIedName() {
-        return isSetRefersToAccessPoint();
+        return iedNameESet;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java
index 60c3c510bb3d8c85acfbd913413df2c506f9751d..8652af14275d68464583d85a02ee8169d244144d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java
@@ -312,12 +312,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getIedName() {
-        if( ied != null ) {
-            return ied.getName();
-        }
         return iedName;
     }
 
@@ -350,23 +347,20 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated NOT
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetIedName() {
-        return isSetIED();
+        return iedNameESet;
     }
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getLdInst() {
-        if( lDevice != null ) {
-            return lDevice.getInst();
-        }
         return ldInst;
     }
 
@@ -399,23 +393,20 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated NOT
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetLdInst() {
-        return isSetLDevice();
+        return ldInstESet;
     }
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getLnClass() {
-        if( ln != null ) {
-            return ln.getLnClass();
-        }
         return lnClass;
     }
 
@@ -448,12 +439,12 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated NOT
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetLnClass() {
-        return isSetLN();
+        return lnClassESet;
     }
 
     /**
@@ -494,12 +485,12 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
     }
 
     /**
-    * <!-- begin-user-doc -->
-    * <!-- end-user-doc -->
-    * @generated not
-    */
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public boolean isSetLnInst() {
-        return isSetLN();
+        return lnInstESet;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java
index 4567ad4d333fc91b39fc36f0a2c51ad5edd9fda5..18ce9ee67df7ddf6bab3b384b582f5f03532bdb9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java
@@ -226,12 +226,9 @@ public class SDOImpl extends UnNamingImpl implements SDO {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getType() {
-        if( isSetRefersToDOType() ) {
-            return getRefersToDOType().getId();
-        }
         return type;
     }
 
@@ -266,10 +263,10 @@ public class SDOImpl extends UnNamingImpl implements SDO {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetType() {
-        return isSetRefersToDOType();
+        return typeESet;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java
index 030478584930ce4abd1405df4f3b522c4d0028f2..884bcd601d21c0061f0b67d49ef499144c6b27e1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java
@@ -119,12 +119,9 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public String getApName() {
-        if( isSetRefersToAccessPoint() ) {
-            return getRefersToAccessPoint().getName();
-        }
         return apName;
     }
 
@@ -159,10 +156,10 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     public boolean isSetApName() {
-        return isSetRefersToAccessPoint();
+        return apNameESet;
     }
 
     /**