diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_applicableServiceNS_TApplicableServiceNS.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateAbbreviations_abbreviation_Abbreviation.gif
similarity index 71%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_applicableServiceNS_TApplicableServiceNS.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateAbbreviations_abbreviation_Abbreviation.gif
index 464e623af1bec3cb9169427f8df20d5108dce5cc..90bc42c7025b56f053dd37023470bfc18c915541 100644
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_applicableServiceNS_TApplicableServiceNS.gif and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateAbbreviations_abbreviation_Abbreviation.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_copyright_TCopyrightNotice.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateAnyLNClass_dataObject_DataObject.gif
similarity index 71%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_copyright_TCopyrightNotice.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateAnyLNClass_dataObject_DataObject.gif
index f9be6da8f0d6f383d1c7bd8399c52a2ae1471218..5ea562b4e5409a263adb7b90ea4bd861944468c7 100644
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_copyright_TCopyrightNotice.gif and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateAnyLNClass_dataObject_DataObject.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nSDoc_TNSDoc.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateApplicableServiceNS_serviceNsUsage_ServiceNsUsage.gif
similarity index 71%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nSDoc_TNSDoc.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateApplicableServiceNS_serviceNsUsage_ServiceNsUsage.gif
index 4ce1821708002471aeef8f03b62ff111d81b2a59..00da844bb39721a6b117d055c12bde522647dba5 100644
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nSDoc_TNSDoc.gif and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateApplicableServiceNS_serviceNsUsage_ServiceNsUsage.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nS_TNS.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateApplicableServices_dataSetMemberOf_DataSetMemberOf.gif
similarity index 71%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nS_TNS.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateApplicableServices_dataSetMemberOf_DataSetMemberOf.gif
index 5b78080875cb046770b6a0b2b5dc9fde9bbab56f..a20a9792220c6ca20551a0b777c77d545b4b6303 100644
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nS_TNS.gif and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateApplicableServices_dataSetMemberOf_DataSetMemberOf.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateApplicableServices_service_ServiceType.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateApplicableServices_service_ServiceType.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6d27c0fbe678ab2830a3486b4f671e4f4408e7a0
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateApplicableServices_service_ServiceType.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateBasicTypes_basicType_BasicType.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateBasicTypes_basicType_BasicType.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d43be4bc9840c68af4c7803e5ed3e5b4e2ed9486
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateBasicTypes_basicType_BasicType.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceCDC_serviceDataAttribute_TServiceDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDC_dataAttribute_DataAttribute.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceCDC_serviceDataAttribute_TServiceDataAttribute.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDC_dataAttribute_DataAttribute.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDC_serviceParameter_ServiceParameter.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDC_serviceParameter_ServiceParameter.gif
new file mode 100644
index 0000000000000000000000000000000000000000..62e68eb56148cc9ab16df336a9e8cc89c62a9899
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDC_serviceParameter_ServiceParameter.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDC_subDataObject_SubDataObject.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDC_subDataObject_SubDataObject.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e01d292ec409d45567216700f69e706334bae343
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDC_subDataObject_SubDataObject.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceCDCs_serviceCDC_TServiceCDC.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDCs_cDC_CDC.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceCDCs_serviceCDC_TServiceCDC.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCDCs_cDC_CDC.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttribute_subDataAttribute_SubDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttribute_subDataAttribute_SubDataAttribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..91619bc626b848ef7ed4433cbe57ee957ea7af43
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttribute_subDataAttribute_SubDataAttribute.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceConstructedAttributes_serviceConstructedAttribute_TServiceConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttributes_constructedAttribute_ConstructedAttribute.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceConstructedAttributes_serviceConstructedAttribute_TServiceConstructedAttribute.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttributes_constructedAttribute_ConstructedAttribute.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttributes_constructedAttribute_ServiceConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttributes_constructedAttribute_ServiceConstructedAttribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0c81e8e08892d14b94ddc6df31e5ab3eea4344d3
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttributes_constructedAttribute_ServiceConstructedAttribute.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCopyrightNotice_license_License.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCopyrightNotice_license_License.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8f0a0b2b5bda61f3ff66d5c2fdd9db36122c8c75
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCopyrightNotice_license_License.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCopyrightNotice_notice_Notice.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCopyrightNotice_notice_Notice.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c200e691abd4deb48fdbbe790765c9a97d5e30a1
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCopyrightNotice_notice_Notice.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCopyrighted_copyright_CopyrightNotice.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCopyrighted_copyright_CopyrightNotice.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4cd1bcc2cf571a7392af86aaf69a1364a99827bc
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateCopyrighted_copyright_CopyrightNotice.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_applicableServiceNS_ApplicableServiceNS.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_applicableServiceNS_ApplicableServiceNS.gif
new file mode 100644
index 0000000000000000000000000000000000000000..55f49ef103bd40214e96064aabcbbd02a8b2a51c
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_applicableServiceNS_ApplicableServiceNS.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_copyright_CopyrightNotice.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_copyright_CopyrightNotice.gif
new file mode 100644
index 0000000000000000000000000000000000000000..81984fd9eaae5353aa0291b335736fa24b20a6a8
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_copyright_CopyrightNotice.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nSDoc_NSDoc.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nSDoc_NSDoc.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5d9762db42ff29506bafb545bdd986bcdb9303ef
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nSDoc_NSDoc.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_serviceNS_TServiceNS.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nS_NS.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_serviceNS_TServiceNS.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_nS_NS.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_serviceNS_ServiceNS.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_serviceNS_ServiceNS.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6b4e4321e6ec810a7e664b2a5a20acea983450c2
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateDocumentRoot_serviceNS_ServiceNS.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateEnumeration_literal_Literal.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateEnumeration_literal_Literal.gif
new file mode 100644
index 0000000000000000000000000000000000000000..40cc20be27b373cc44a2be7d97c5db548d7ffd8f
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateEnumeration_literal_Literal.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateEnumerations_enumeration_Enumeration.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateEnumerations_enumeration_Enumeration.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ab255f3d5735dd2d24b6ca31086c08ed34448725
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateEnumerations_enumeration_Enumeration.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateFunctionalConstraint_applicableServices_ApplicableServices.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateFunctionalConstraint_applicableServices_ApplicableServices.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a9793d76a24b099c2f0e077d25b9df9d8a71f980
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateFunctionalConstraint_applicableServices_ApplicableServices.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateFunctionalConstraints_functionalConstraint_FunctionalConstraint.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateFunctionalConstraints_functionalConstraint_FunctionalConstraint.gif
new file mode 100644
index 0000000000000000000000000000000000000000..90bc42c7025b56f053dd37023470bfc18c915541
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateFunctionalConstraints_functionalConstraint_FunctionalConstraint.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateLNClasses_abstractLNClass_AbstractLNClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateLNClasses_abstractLNClass_AbstractLNClass.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8b6df378675bf2d7a741c5933395bafc19999544
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateLNClasses_abstractLNClass_AbstractLNClass.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateLNClasses_lNClass_LNClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateLNClasses_lNClass_LNClass.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a36743b171e24e11461c892ffb377316367d0476
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateLNClasses_lNClass_LNClass.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNSDoc_doc_Doc.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNSDoc_doc_Doc.gif
new file mode 100644
index 0000000000000000000000000000000000000000..28de654b2910e308dacd0700d0b67ae900282a3d
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNSDoc_doc_Doc.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_abbreviations_Abbreviations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_abbreviations_Abbreviations.gif
new file mode 100644
index 0000000000000000000000000000000000000000..58bd8cfbda4a3e280ce8576da14e7b581d4c9ec5
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_abbreviations_Abbreviations.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_basicTypes_BasicTypes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_basicTypes_BasicTypes.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e17a9f8cd8d226a185f08b565bb13198ca67e68f
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_basicTypes_BasicTypes.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_serviceCDCs_TServiceCDCs.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_cDCs_CDCs.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_serviceCDCs_TServiceCDCs.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_cDCs_CDCs.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_changes_Changes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_changes_Changes.gif
new file mode 100644
index 0000000000000000000000000000000000000000..064dd753f37e2cb898d8ce99bbaf2b968d7d6529
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_changes_Changes.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_serviceConstructedAttributes_TServiceConstructedAttributes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_constructedAttributes_ConstructedAttributes.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_serviceConstructedAttributes_TServiceConstructedAttributes.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_constructedAttributes_ConstructedAttributes.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_dependsOn_DependsOnType.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_dependsOn_DependsOnType.gif
new file mode 100644
index 0000000000000000000000000000000000000000..51319fc361e54a7ea51fa5e67ca24bd7543a3631
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_dependsOn_DependsOnType.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_enumerations_Enumerations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_enumerations_Enumerations.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a1607f910083346345671e52588d6acdb6f1dd0f
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_enumerations_Enumerations.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_functionalConstraints_FunctionalConstraints.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_functionalConstraints_FunctionalConstraints.gif
new file mode 100644
index 0000000000000000000000000000000000000000..58bd8cfbda4a3e280ce8576da14e7b581d4c9ec5
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_functionalConstraints_FunctionalConstraints.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_lNClasses_LNClasses.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_lNClasses_LNClasses.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f7e8a7b2a2f4d573d62601aa45866ff90efbd88e
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_lNClasses_LNClasses.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_presenceConditions_PresenceConditions.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_presenceConditions_PresenceConditions.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ab255f3d5735dd2d24b6ca31086c08ed34448725
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateNS_presenceConditions_PresenceConditions.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreatePresenceConditions_presenceCondition_PresenceCondition.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreatePresenceConditions_presenceCondition_PresenceCondition.gif
new file mode 100644
index 0000000000000000000000000000000000000000..698161b331b6fce0c15804ccd44683d5a19ac71c
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreatePresenceConditions_presenceCondition_PresenceCondition.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceCDC_serviceDataAttribute_ServiceDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceCDC_serviceDataAttribute_ServiceDataAttribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..78f72fbc2ac2a44a1faca46c6adf2a87ea360a1e
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceCDC_serviceDataAttribute_ServiceDataAttribute.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTBasicTypes_basicType_TBasicType.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceCDCs_serviceCDC_ServiceCDC.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTBasicTypes_basicType_TBasicType.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceCDCs_serviceCDC_ServiceCDC.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceConstructedAttributes_serviceConstructedAttribute_ServiceConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceConstructedAttributes_serviceConstructedAttribute_ServiceConstructedAttribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4d1b6d68c5bf556493cf80c85cad27de004c7643
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceConstructedAttributes_serviceConstructedAttribute_ServiceConstructedAttribute.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_abbreviations_Abbreviations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_abbreviations_Abbreviations.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7b489fdd24da723b6410366124a1cb0dc2d31c89
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_abbreviations_Abbreviations.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_changes_Changes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_changes_Changes.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bdcb71c7dd2054cab09e72644cee5600b4055058
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_changes_Changes.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_functionalConstraints_FunctionalConstraints.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_functionalConstraints_FunctionalConstraints.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7b489fdd24da723b6410366124a1cb0dc2d31c89
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_functionalConstraints_FunctionalConstraints.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_presenceConditions_PresenceConditions.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_presenceConditions_PresenceConditions.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6613451ef7b1d28d69864ec976fd12ad498b30b5
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_presenceConditions_PresenceConditions.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_serviceCDCs_ServiceCDCs.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_serviceCDCs_ServiceCDCs.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b14c5082ff466afa82cfc7fba7ac24b761070e6b
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_serviceCDCs_ServiceCDCs.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_serviceConstructedAttributes_ServiceConstructedAttributes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_serviceConstructedAttributes_ServiceConstructedAttributes.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b4b69fc695281a897de6ec9292e11df7c48d0069
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_serviceConstructedAttributes_ServiceConstructedAttributes.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_serviceTypeRealizations_ServiceTypeRealizations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_serviceTypeRealizations_ServiceTypeRealizations.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2067b0c31a6c1501a9f466efa086fe3ace10f9c5
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNS_serviceTypeRealizations_ServiceTypeRealizations.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNsUsage_appliesTo_AppliesToType.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNsUsage_appliesTo_AppliesToType.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1cda1f2c418e6bc0233a86ba08a5fbdcb97f626d
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceNsUsage_appliesTo_AppliesToType.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceTypeRealizations_serviceTypeRealization_ConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceTypeRealizations_serviceTypeRealization_ConstructedAttribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d064fcba110a42b3d10c1f180263c43445fdb3ef
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceTypeRealizations_serviceTypeRealization_ConstructedAttribute.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceTypeRealizations_serviceTypeRealization_ServiceConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceTypeRealizations_serviceTypeRealization_ServiceConstructedAttribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..27741c67e8b2e15a332e4cfd0d33fb6c716b36b0
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceTypeRealizations_serviceTypeRealization_ServiceConstructedAttribute.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTAbbreviations_abbreviation_TAbbreviation.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTAbbreviations_abbreviation_TAbbreviation.gif
deleted file mode 100644
index 75a50e9797168d949d43c084a8e0f538ce52f9b9..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTAbbreviations_abbreviation_TAbbreviation.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTAnyLNClass_dataObject_TDataObject.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTAnyLNClass_dataObject_TDataObject.gif
deleted file mode 100644
index d203b1d7444ad06025851896742ad53ab23a52dd..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTAnyLNClass_dataObject_TDataObject.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTApplicableServiceNS_serviceNsUsage_TServiceNsUsage.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTApplicableServiceNS_serviceNsUsage_TServiceNsUsage.gif
deleted file mode 100644
index 50ac6daf7ed170da8972dc9b878bc21df67ed47a..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTApplicableServiceNS_serviceNsUsage_TServiceNsUsage.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTApplicableServices_dataSetMemberOf_TDataSetMemberOf.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTApplicableServices_dataSetMemberOf_TDataSetMemberOf.gif
deleted file mode 100644
index bf56763cd023ae9231705dcef6b7370ce9620ae6..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTApplicableServices_dataSetMemberOf_TDataSetMemberOf.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTApplicableServices_service_ServiceType.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTApplicableServices_service_ServiceType.gif
deleted file mode 100644
index bf56763cd023ae9231705dcef6b7370ce9620ae6..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTApplicableServices_service_ServiceType.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDC_dataAttribute_TDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDC_dataAttribute_TDataAttribute.gif
deleted file mode 100644
index b6a1aceeddbe006c82b5f3102376e47cd6e7eb6f..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDC_dataAttribute_TDataAttribute.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDC_serviceParameter_TServiceParameter.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDC_serviceParameter_TServiceParameter.gif
deleted file mode 100644
index f9e5fa823dae523cbf28d74b8e4f586df9098150..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDC_serviceParameter_TServiceParameter.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDC_subDataObject_TSubDataObject.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDC_subDataObject_TSubDataObject.gif
deleted file mode 100644
index ed16f99f0c22fe084d0c13b73f0a76558e4187b4..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDC_subDataObject_TSubDataObject.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDCs_cDC_TCDC.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDCs_cDC_TCDC.gif
deleted file mode 100644
index 5766979ace0102112fd64e06602aefa40fdbcce8..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCDCs_cDC_TCDC.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTConstructedAttribute_subDataAttribute_TSubDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTConstructedAttribute_subDataAttribute_TSubDataAttribute.gif
deleted file mode 100644
index c85d5ad3a7e887b2da130c7e2efb426a8d7e64ed..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTConstructedAttribute_subDataAttribute_TSubDataAttribute.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTConstructedAttributes_constructedAttribute_TConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTConstructedAttributes_constructedAttribute_TConstructedAttribute.gif
deleted file mode 100644
index 589ded3dfbde2368c1de8f9c11b19ace32d6ee81..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTConstructedAttributes_constructedAttribute_TConstructedAttribute.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTConstructedAttributes_constructedAttribute_TServiceConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTConstructedAttributes_constructedAttribute_TServiceConstructedAttribute.gif
deleted file mode 100644
index 289eb8bf3851a5a2b39203366e46e4533a5cb076..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTConstructedAttributes_constructedAttribute_TServiceConstructedAttribute.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCopyrightNotice_license_TLicense.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCopyrightNotice_license_TLicense.gif
deleted file mode 100644
index 4c7f166dc4cbbbe39079f159ed44cfce8f1d9222..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCopyrightNotice_license_TLicense.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCopyrightNotice_notice_TNotice.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCopyrightNotice_notice_TNotice.gif
deleted file mode 100644
index 07adaab9f3a18020b0770b8d7bb1244b28cdd8de..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCopyrightNotice_notice_TNotice.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCopyrighted_copyright_TCopyrightNotice.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCopyrighted_copyright_TCopyrightNotice.gif
deleted file mode 100644
index 05dffc0a5ca466028783f0ab8ede814763b8e6fe..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTCopyrighted_copyright_TCopyrightNotice.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTEnumeration_literal_TLiteral.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTEnumeration_literal_TLiteral.gif
deleted file mode 100644
index b3a2d022b7a46d296ae303203809034de9c205bc..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTEnumeration_literal_TLiteral.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTEnumerations_enumeration_TEnumeration.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTEnumerations_enumeration_TEnumeration.gif
deleted file mode 100644
index 73486a0c2db1f4a597d1e68276beb0b0ed7e80d8..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTEnumerations_enumeration_TEnumeration.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTFunctionalConstraint_applicableServices_TApplicableServices.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTFunctionalConstraint_applicableServices_TApplicableServices.gif
deleted file mode 100644
index 1edc5b9b23cf1c2c9ce8f303fec3cf3f94cf6bc4..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTFunctionalConstraint_applicableServices_TApplicableServices.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTFunctionalConstraints_functionalConstraint_TFunctionalConstraint.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTFunctionalConstraints_functionalConstraint_TFunctionalConstraint.gif
deleted file mode 100644
index 75a50e9797168d949d43c084a8e0f538ce52f9b9..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTFunctionalConstraints_functionalConstraint_TFunctionalConstraint.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTLNClasses_abstractLNClass_TAbstractLNClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTLNClasses_abstractLNClass_TAbstractLNClass.gif
deleted file mode 100644
index d847f1b240113c9afb29e93e8c81445440b808e0..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTLNClasses_abstractLNClass_TAbstractLNClass.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTLNClasses_lNClass_TLNClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTLNClasses_lNClass_TLNClass.gif
deleted file mode 100644
index e83e884daab92968f0214de522f83757650c1b47..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTLNClasses_lNClass_TLNClass.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNSDoc_doc_TDoc.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNSDoc_doc_TDoc.gif
deleted file mode 100644
index fc17ce1f3934e33bc78e9dc80b93d8e8a0038f3a..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNSDoc_doc_TDoc.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_abbreviations_TAbbreviations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_abbreviations_TAbbreviations.gif
deleted file mode 100644
index 5a593b6190f37120215dcb71123289cd6ff9ab8d..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_abbreviations_TAbbreviations.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_basicTypes_TBasicTypes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_basicTypes_TBasicTypes.gif
deleted file mode 100644
index b82fff7ab452de12a3842b56e606fcd22deafa3a..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_basicTypes_TBasicTypes.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_cDCs_TCDCs.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_cDCs_TCDCs.gif
deleted file mode 100644
index 247671fa2f2b04669c256db7a7ac4698521f6e46..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_cDCs_TCDCs.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_changes_TChanges.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_changes_TChanges.gif
deleted file mode 100644
index d192e7c2c0b12086b8e19647ddc82bd559196f52..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_changes_TChanges.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_constructedAttributes_TConstructedAttributes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_constructedAttributes_TConstructedAttributes.gif
deleted file mode 100644
index 32f857fd43dadcf04d3ac028b425a621cbf1b67a..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_constructedAttributes_TConstructedAttributes.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_dependsOn_DependsOnType.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_dependsOn_DependsOnType.gif
deleted file mode 100644
index db2e9afd1d66186807006c834e5120dd29a2064c..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_dependsOn_DependsOnType.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_enumerations_TEnumerations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_enumerations_TEnumerations.gif
deleted file mode 100644
index e22c7e4cc469d050c527b7643d63ab6e7f2ff0f5..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_enumerations_TEnumerations.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_functionalConstraints_TFunctionalConstraints.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_functionalConstraints_TFunctionalConstraints.gif
deleted file mode 100644
index 5a593b6190f37120215dcb71123289cd6ff9ab8d..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_functionalConstraints_TFunctionalConstraints.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_lNClasses_TLNClasses.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_lNClasses_TLNClasses.gif
deleted file mode 100644
index 414b3c5f11aab7ab69c04c20eefacbe1a9f05513..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_lNClasses_TLNClasses.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_presenceConditions_TPresenceConditions.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_presenceConditions_TPresenceConditions.gif
deleted file mode 100644
index 73486a0c2db1f4a597d1e68276beb0b0ed7e80d8..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTNS_presenceConditions_TPresenceConditions.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTPresenceConditions_presenceCondition_TPresenceCondition.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTPresenceConditions_presenceCondition_TPresenceCondition.gif
deleted file mode 100644
index 65e9a41807f7a448b15e2b038cb1af59ac7b000e..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTPresenceConditions_presenceCondition_TPresenceCondition.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_abbreviations_TAbbreviations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_abbreviations_TAbbreviations.gif
deleted file mode 100644
index 74f7ceb34b938a5d45117b8b00f03c067b4a51a8..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_abbreviations_TAbbreviations.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_changes_TChanges.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_changes_TChanges.gif
deleted file mode 100644
index 9b19f705944427e17a1e9dcb69b79d3466837f80..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_changes_TChanges.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_functionalConstraints_TFunctionalConstraints.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_functionalConstraints_TFunctionalConstraints.gif
deleted file mode 100644
index 74f7ceb34b938a5d45117b8b00f03c067b4a51a8..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_functionalConstraints_TFunctionalConstraints.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_presenceConditions_TPresenceConditions.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_presenceConditions_TPresenceConditions.gif
deleted file mode 100644
index 89d8767bf56c38fd34720d1577c45b61dc8817ca..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_presenceConditions_TPresenceConditions.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_serviceTypeRealizations_TServiceTypeRealizations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_serviceTypeRealizations_TServiceTypeRealizations.gif
deleted file mode 100644
index 381214b7725a0ba12c093604e1b4bf4c563cc604..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNS_serviceTypeRealizations_TServiceTypeRealizations.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNsUsage_appliesTo_AppliesToType.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNsUsage_appliesTo_AppliesToType.gif
deleted file mode 100644
index 9402ae7ef37fcb66d6a5e014ef7c43a11b5d062c..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceNsUsage_appliesTo_AppliesToType.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceTypeRealizations_serviceTypeRealization_TConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceTypeRealizations_serviceTypeRealization_TConstructedAttribute.gif
deleted file mode 100644
index e9245bcdf6ce78f567069d1828d7daae12c2b8c6..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceTypeRealizations_serviceTypeRealization_TConstructedAttribute.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceTypeRealizations_serviceTypeRealization_TServiceConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceTypeRealizations_serviceTypeRealization_TServiceConstructedAttribute.gif
deleted file mode 100644
index 420dc70ca847db12046841705530d67cf1036d9f..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateTServiceTypeRealizations_serviceTypeRealization_TServiceConstructedAttribute.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCopyrighted.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Abbreviation.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCopyrighted.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Abbreviation.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TAbbreviations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Abbreviations.gif
similarity index 50%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TAbbreviations.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Abbreviations.gif
index 739ebbfa6ac7b44cc1632663c006f47e20f05127..14af8aaee9f431cebfb2b13249821419380131a3 100644
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TAbbreviations.gif and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Abbreviations.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TAbstractLNClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/AbstractLNClass.gif
similarity index 50%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TAbstractLNClass.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/AbstractLNClass.gif
index 498364f1c1ae0e61f26b0063dea3a1606959210e..e4bc22dd17e82d9350631bd55ad9671957cdaf50 100644
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TAbstractLNClass.gif and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/AbstractLNClass.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TApplicableServiceNS.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ApplicableServiceNS.gif
similarity index 50%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TApplicableServiceNS.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ApplicableServiceNS.gif
index 7b7c428c715e615c179d42a8462ee953741414d4..30f0c48da8d4450f7e94a696c4de0a7cc41aa728 100644
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TApplicableServiceNS.gif and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ApplicableServiceNS.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceCDC.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ApplicableServices.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceCDC.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ApplicableServices.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCDCs.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/BasicType.gif
similarity index 50%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCDCs.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/BasicType.gif
index 05dc74ad5da0d7b040b29537d5b24f2b120b11d5..f8041d22553d3f326e3e82be501f2e9bac3794b0 100644
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCDCs.gif and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/BasicType.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/BasicTypes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/BasicTypes.gif
new file mode 100644
index 0000000000000000000000000000000000000000..94c953e013baf5c1efe99489cbbf6fc39dd41341
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/BasicTypes.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/CDC.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/CDC.gif
new file mode 100644
index 0000000000000000000000000000000000000000..10d222998af0a3a571390bae7e117c9964ec1562
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/CDC.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceCDCs.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/CDCs.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceCDCs.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/CDCs.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Changes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Changes.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b1f8afa47661703c49bd5fa535dcb1342deb6fc4
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Changes.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ConstructedAttribute.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceConstructedAttribute.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ConstructedAttribute.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceConstructedAttributes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ConstructedAttributes.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceConstructedAttributes.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ConstructedAttributes.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/CopyrightNotice.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/CopyrightNotice.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b1f8afa47661703c49bd5fa535dcb1342deb6fc4
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/CopyrightNotice.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Copyrighted.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Copyrighted.gif
new file mode 100644
index 0000000000000000000000000000000000000000..db7414e937292c344d6fd0d0805085b67650f5c8
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Copyrighted.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DataAttribute.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceDataAttribute.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DataAttribute.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DataObject.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDataAttribute.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DataObject.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DataSetMemberOf.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DataSetMemberOf.gif
new file mode 100644
index 0000000000000000000000000000000000000000..136e3b27269e84a045f9b528614d7dfd316e444c
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DataSetMemberOf.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Doc.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Doc.gif
new file mode 100644
index 0000000000000000000000000000000000000000..90d10f9470787d1465c462197b85d1d3621f84e4
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Doc.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DocumentedClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DocumentedClass.gif
new file mode 100644
index 0000000000000000000000000000000000000000..33854e98c25a13543eb9477dc67b0baf87fc81aa
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/DocumentedClass.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Enumeration.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Enumeration.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b6925602975de13459862ee32e1b0d97549bf67
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Enumeration.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TApplicableServices.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Enumerations.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TApplicableServices.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Enumerations.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/FunctionalConstraint.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/FunctionalConstraint.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9250fecbffd185d174d53f6b7ea979f63ce222d2
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/FunctionalConstraint.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/FunctionalConstraints.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/FunctionalConstraints.gif
new file mode 100644
index 0000000000000000000000000000000000000000..14af8aaee9f431cebfb2b13249821419380131a3
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/FunctionalConstraints.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TEnumeration.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/LNClass.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TEnumeration.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/LNClass.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/LNClasses.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/LNClasses.gif
new file mode 100644
index 0000000000000000000000000000000000000000..338fb8d9a728b682e398849d2038959d01b4e0f2
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/LNClasses.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/License.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/License.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c414fe9f728a37e7a2578cf66e5d3f625b429d0e
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/License.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TPresenceConditions.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Literal.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TPresenceConditions.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Literal.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCDC.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/NS.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCDC.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/NS.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/NSDoc.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/NSDoc.gif
new file mode 100644
index 0000000000000000000000000000000000000000..338fb8d9a728b682e398849d2038959d01b4e0f2
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/NSDoc.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TAbbreviation.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Notice.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TAbbreviation.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/Notice.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/PresenceCondition.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/PresenceCondition.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4fb30e96873d2484faec9d508dcbdd69e73d82e
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/PresenceCondition.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/PresenceConditions.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/PresenceConditions.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b6925602975de13459862ee32e1b0d97549bf67
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/PresenceConditions.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TBasicType.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceCDC.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TBasicType.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceCDC.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TBasicTypes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceCDCs.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TBasicTypes.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceCDCs.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceConstructedAttribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8a5c70cbd74c87cb3b1df383e0c242ede4660c3b
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceConstructedAttribute.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceConstructedAttributes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceConstructedAttributes.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ed8747474012f8278002a9785026a1a40155b192
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceConstructedAttributes.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceDataAttribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b3643da048a40135b62eed5100cac5afe1ecef3c
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceDataAttribute.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceNS.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceNS.gif
new file mode 100644
index 0000000000000000000000000000000000000000..10d222998af0a3a571390bae7e117c9964ec1562
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceNS.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TFunctionalConstraint.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceNsUsage.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TFunctionalConstraint.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceNsUsage.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceParameter.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceParameter.gif
new file mode 100644
index 0000000000000000000000000000000000000000..35ef84e20e26f1cef1dcd7ae80d192fd40472368
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceParameter.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceTypeRealization.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceTypeRealization.gif
new file mode 100644
index 0000000000000000000000000000000000000000..136e3b27269e84a045f9b528614d7dfd316e444c
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceTypeRealization.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceTypeRealizations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceTypeRealizations.gif
new file mode 100644
index 0000000000000000000000000000000000000000..caf2804510dc36959fb4e045e8af91d01229dcd7
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/ServiceTypeRealizations.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/SubDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/SubDataAttribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b6925602975de13459862ee32e1b0d97549bf67
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/SubDataAttribute.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TSubDataAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/SubDataObject.gif
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TSubDataAttribute.gif
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/SubDataObject.gif
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TChanges.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TChanges.gif
deleted file mode 100644
index a26660ec28fda4a4216562537c32047bab42b782..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TChanges.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TConstructedAttribute.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TConstructedAttribute.gif
deleted file mode 100644
index 83afb9b3c9a3c3e261dd043d2232d39254ac8e4a..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TConstructedAttribute.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TConstructedAttributes.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TConstructedAttributes.gif
deleted file mode 100644
index c3370c7ddd5e0817a59de6fd45ad0993b52abe28..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TConstructedAttributes.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCopyrightNotice.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCopyrightNotice.gif
deleted file mode 100644
index a26660ec28fda4a4216562537c32047bab42b782..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TCopyrightNotice.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDataObject.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDataObject.gif
deleted file mode 100644
index a17dc7d88e993e89a1d5f913ddfab16b1676c5bb..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDataObject.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDataSetMemberOf.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDataSetMemberOf.gif
deleted file mode 100644
index c8d381f0b327e1289745a7e8ea72b5cc7b782bfe..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDataSetMemberOf.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDoc.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDoc.gif
deleted file mode 100644
index 134551bff7eb3f0beb14a6c4a270a2a94f782ec5..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDoc.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDocumentedClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDocumentedClass.gif
deleted file mode 100644
index d92f34c8aea721c98537ccb1f4da29bdee3b8912..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TDocumentedClass.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TEnumerations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TEnumerations.gif
deleted file mode 100644
index 1e5345fb3237c2f6eabcee2dbe44a371b49d8379..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TEnumerations.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TFunctionalConstraints.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TFunctionalConstraints.gif
deleted file mode 100644
index 739ebbfa6ac7b44cc1632663c006f47e20f05127..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TFunctionalConstraints.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLNClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLNClass.gif
deleted file mode 100644
index 53500daf98e17bc98acd04b14eb7b16938ceb4dd..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLNClass.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLNClasses.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLNClasses.gif
deleted file mode 100644
index 89ad5da38ab3060f14ba925b1251bd5cb8454012..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLNClasses.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLicense.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLicense.gif
deleted file mode 100644
index 420eee177528d9bd6d862c38d2a66c14835a6140..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLicense.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLiteral.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLiteral.gif
deleted file mode 100644
index 53500daf98e17bc98acd04b14eb7b16938ceb4dd..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TLiteral.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TNS.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TNS.gif
deleted file mode 100644
index 1e5345fb3237c2f6eabcee2dbe44a371b49d8379..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TNS.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TNSDoc.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TNSDoc.gif
deleted file mode 100644
index 89ad5da38ab3060f14ba925b1251bd5cb8454012..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TNSDoc.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TNotice.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TNotice.gif
deleted file mode 100644
index 48e3cf2268736efbb8bc3c5bd29315702f2b38c4..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TNotice.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TPresenceCondition.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TPresenceCondition.gif
deleted file mode 100644
index 45731fe28e7e3521c15328ef201d58b47a13b383..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TPresenceCondition.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceNS.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceNS.gif
deleted file mode 100644
index cdd3b76e3c0b3318166d84292d8d9e2146a48aa1..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceNS.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceNsUsage.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceNsUsage.gif
deleted file mode 100644
index 48e3cf2268736efbb8bc3c5bd29315702f2b38c4..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceNsUsage.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceParameter.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceParameter.gif
deleted file mode 100644
index a3908bcf7b4ec0b29040bb1ef944c4d5a93fbb32..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceParameter.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceTypeRealization.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceTypeRealization.gif
deleted file mode 100644
index c8d381f0b327e1289745a7e8ea72b5cc7b782bfe..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceTypeRealization.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceTypeRealizations.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceTypeRealizations.gif
deleted file mode 100644
index 98b351f1c441775dfbe390577f2e534a4dcf07f9..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TServiceTypeRealizations.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TSubDataObject.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TSubDataObject.gif
deleted file mode 100644
index 53500daf98e17bc98acd04b14eb7b16938ceb4dd..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TSubDataObject.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TTitledClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TTitledClass.gif
deleted file mode 100644
index c3370c7ddd5e0817a59de6fd45ad0993b52abe28..0000000000000000000000000000000000000000
Binary files a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TTitledClass.gif and /dev/null differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TitledClass.gif b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TitledClass.gif
new file mode 100644
index 0000000000000000000000000000000000000000..33a997a1606acf7cb8a32921faeee1e5c809a0cb
Binary files /dev/null and b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/obj16/TitledClass.gif differ
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/plugin.properties b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/plugin.properties
index da1d5b177bed8de7149a307a295b95c2fab220ac..eb90164effc06bdcbf5e48bedfedf42fedf1492e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/plugin.properties
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/plugin.properties
@@ -16,7 +16,7 @@
 #      http://wdi.supelec.fr/software/RiseClipse/
 # 
 
-pluginName = NSD Edit Support
+pluginName = NSD Model Edit Support
 providerName = www.example.org
 
 _UI_CreateChild_text = {0}
@@ -32,52 +32,52 @@ _UI_AppliesToType_type = Applies To Type
 _UI_DependsOnType_type = Depends On Type
 _UI_DocumentRoot_type = Document Root
 _UI_ServiceType_type = Service Type
-_UI_TAbbreviation_type = TAbbreviation
-_UI_TAbbreviations_type = TAbbreviations
-_UI_TAbstractLNClass_type = TAbstract LN Class
-_UI_TAnyLNClass_type = TAny LN Class
-_UI_TApplicableServiceNS_type = TApplicable Service NS
-_UI_TApplicableServices_type = TApplicable Services
-_UI_TBasicType_type = TBasic Type
-_UI_TBasicTypes_type = TBasic Types
-_UI_TCDC_type = TCDC
-_UI_TCDCs_type = TCD Cs
-_UI_TChanges_type = TChanges
-_UI_TConstructedAttribute_type = TConstructed Attribute
-_UI_TConstructedAttributes_type = TConstructed Attributes
-_UI_TCopyrighted_type = TCopyrighted
-_UI_TCopyrightNotice_type = TCopyright Notice
-_UI_TDataAttribute_type = TData Attribute
-_UI_TDataObject_type = TData Object
-_UI_TDataSetMemberOf_type = TData Set Member Of
-_UI_TDoc_type = TDoc
-_UI_TDocumentedClass_type = TDocumented Class
-_UI_TEnumeration_type = TEnumeration
-_UI_TEnumerations_type = TEnumerations
-_UI_TFunctionalConstraint_type = TFunctional Constraint
-_UI_TFunctionalConstraints_type = TFunctional Constraints
-_UI_TLicense_type = TLicense
-_UI_TLiteral_type = TLiteral
-_UI_TLNClass_type = TLN Class
-_UI_TLNClasses_type = TLN Classes
-_UI_TNotice_type = TNotice
-_UI_TNS_type = TNS
-_UI_TNSDoc_type = TNS Doc
-_UI_TPresenceCondition_type = TPresence Condition
-_UI_TPresenceConditions_type = TPresence Conditions
-_UI_TServiceCDC_type = TService CDC
-_UI_TServiceCDCs_type = TService CD Cs
-_UI_TServiceConstructedAttribute_type = TService Constructed Attribute
-_UI_TServiceConstructedAttributes_type = TService Constructed Attributes
-_UI_TServiceDataAttribute_type = TService Data Attribute
-_UI_TServiceNS_type = TService NS
-_UI_TServiceNsUsage_type = TService Ns Usage
-_UI_TServiceParameter_type = TService Parameter
-_UI_TServiceTypeRealization_type = TService Type Realization
-_UI_TServiceTypeRealizations_type = TService Type Realizations
-_UI_TSubDataAttribute_type = TSub Data Attribute
-_UI_TSubDataObject_type = TSub Data Object
-_UI_TTitledClass_type = TTitled Class
+_UI_Abbreviation_type = Abbreviation
+_UI_Abbreviations_type = Abbreviations
+_UI_AbstractLNClass_type = Abstract LN Class
+_UI_AnyLNClass_type = Any LN Class
+_UI_ApplicableServiceNS_type = Applicable Service NS
+_UI_ApplicableServices_type = Applicable Services
+_UI_BasicType_type = Basic Type
+_UI_BasicTypes_type = Basic Types
+_UI_CDC_type = CDC
+_UI_CDCs_type = CD Cs
+_UI_Changes_type = Changes
+_UI_ConstructedAttribute_type = Constructed Attribute
+_UI_ConstructedAttributes_type = Constructed Attributes
+_UI_Copyrighted_type = Copyrighted
+_UI_CopyrightNotice_type = Copyright Notice
+_UI_DataAttribute_type = Data Attribute
+_UI_DataObject_type = Data Object
+_UI_DataSetMemberOf_type = Data Set Member Of
+_UI_Doc_type = Doc
+_UI_DocumentedClass_type = Documented Class
+_UI_Enumeration_type = Enumeration
+_UI_Enumerations_type = Enumerations
+_UI_FunctionalConstraint_type = Functional Constraint
+_UI_FunctionalConstraints_type = Functional Constraints
+_UI_License_type = License
+_UI_Literal_type = Literal
+_UI_LNClass_type = LN Class
+_UI_LNClasses_type = LN Classes
+_UI_Notice_type = Notice
+_UI_NS_type = NS
+_UI_NSDoc_type = NS Doc
+_UI_PresenceCondition_type = Presence Condition
+_UI_PresenceConditions_type = Presence Conditions
+_UI_ServiceCDC_type = Service CDC
+_UI_ServiceCDCs_type = Service CD Cs
+_UI_ServiceConstructedAttribute_type = Service Constructed Attribute
+_UI_ServiceConstructedAttributes_type = Service Constructed Attributes
+_UI_ServiceDataAttribute_type = Service Data Attribute
+_UI_ServiceNS_type = Service NS
+_UI_ServiceNsUsage_type = Service Ns Usage
+_UI_ServiceParameter_type = Service Parameter
+_UI_ServiceTypeRealization_type = Service Type Realization
+_UI_ServiceTypeRealizations_type = Service Type Realizations
+_UI_SubDataAttribute_type = Sub Data Attribute
+_UI_SubDataObject_type = Sub Data Object
+_UI_TitledClass_type = Titled Class
 _UI_Unknown_type = Object
 
 _UI_Unknown_datatype= Value
@@ -101,286 +101,289 @@ _UI_DocumentRoot_nS_feature = NS
 _UI_DocumentRoot_nSDoc_feature = NS Doc
 _UI_DocumentRoot_serviceNS_feature = Service NS
 _UI_ServiceType_name_feature = Name
-_UI_TAbbreviation_descID_feature = Desc ID
-_UI_TAbbreviation_name_feature = Name
-_UI_TAbbreviations_abbreviation_feature = Abbreviation
-_UI_TAbstractLNClass_name_feature = Name
-_UI_TAnyLNClass_dataObject_feature = Data Object
-_UI_TAnyLNClass_base_feature = Base
-_UI_TApplicableServiceNS_serviceNsUsage_feature = Service Ns Usage
-_UI_TApplicableServiceNS_date_feature = Date
-_UI_TApplicableServiceNS_version_feature = Version
-_UI_TApplicableServices_service_feature = Service
-_UI_TApplicableServices_dataSetMemberOf_feature = Data Set Member Of
-_UI_TBasicType_descID_feature = Desc ID
-_UI_TBasicType_name_feature = Name
-_UI_TBasicTypes_basicType_feature = Basic Type
-_UI_TCDC_subDataObject_feature = Sub Data Object
-_UI_TCDC_dataAttribute_feature = Data Attribute
-_UI_TCDC_serviceParameter_feature = Service Parameter
-_UI_TCDC_enumParameterized_feature = Enum Parameterized
-_UI_TCDC_name_feature = Name
-_UI_TCDC_statistics_feature = Statistics
-_UI_TCDC_typeKindParameterized_feature = Type Kind Parameterized
-_UI_TCDC_variant_feature = Variant
-_UI_TCDCs_cDC_feature = CDC
-_UI_TChanges_changesID_feature = Changes ID
-_UI_TChanges_date_feature = Date
-_UI_TChanges_release_feature = Release
-_UI_TChanges_revision_feature = Revision
-_UI_TChanges_tissues_feature = Tissues
-_UI_TChanges_version_feature = Version
-_UI_TConstructedAttribute_subDataAttribute_feature = Sub Data Attribute
-_UI_TConstructedAttribute_name_feature = Name
-_UI_TConstructedAttributes_constructedAttribute_feature = Constructed Attribute
-_UI_TCopyrighted_copyright_feature = Copyright
-_UI_TCopyrightNotice_notice_feature = Notice
-_UI_TCopyrightNotice_license_feature = License
-_UI_TDataAttribute_dchg_feature = Dchg
-_UI_TDataAttribute_defaultValue_feature = Default Value
-_UI_TDataAttribute_dupd_feature = Dupd
-_UI_TDataAttribute_fc_feature = Fc
-_UI_TDataAttribute_isArray_feature = Is Array
-_UI_TDataAttribute_maxIndexAttribute_feature = Max Index Attribute
-_UI_TDataAttribute_maxValue_feature = Max Value
-_UI_TDataAttribute_minIndex_feature = Min Index
-_UI_TDataAttribute_minValue_feature = Min Value
-_UI_TDataAttribute_name_feature = Name
-_UI_TDataAttribute_presCond_feature = Pres Cond
-_UI_TDataAttribute_presCondArgs_feature = Pres Cond Args
-_UI_TDataAttribute_presCondArgsID_feature = Pres Cond Args ID
-_UI_TDataAttribute_qchg_feature = Qchg
-_UI_TDataAttribute_sizeAttribute_feature = Size Attribute
-_UI_TDataAttribute_type_feature = Type
-_UI_TDataAttribute_typeKind_feature = Type Kind
-_UI_TDataObject_dsPresCond_feature = Ds Pres Cond
-_UI_TDataObject_dsPresCondArgs_feature = Ds Pres Cond Args
-_UI_TDataObject_dsPresCondArgsID_feature = Ds Pres Cond Args ID
-_UI_TDataObject_name_feature = Name
-_UI_TDataObject_presCond_feature = Pres Cond
-_UI_TDataObject_presCondArgs_feature = Pres Cond Args
-_UI_TDataObject_presCondArgsID_feature = Pres Cond Args ID
-_UI_TDataObject_transient_feature = Transient
-_UI_TDataObject_type_feature = Type
-_UI_TDataObject_underlyingType_feature = Underlying Type
-_UI_TDataObject_underlyingTypeKind_feature = Underlying Type Kind
-_UI_TDataSetMemberOf_cb_feature = Cb
-_UI_TDoc_mixed_feature = Mixed
-_UI_TDoc_group_feature = Group
-_UI_TDoc_any_feature = Any
-_UI_TDoc_id_feature = Id
-_UI_TDocumentedClass_deprecated_feature = Deprecated
-_UI_TDocumentedClass_descID_feature = Desc ID
-_UI_TDocumentedClass_informative_feature = Informative
-_UI_TEnumeration_literal_feature = Literal
-_UI_TEnumeration_inheritedFrom_feature = Inherited From
-_UI_TEnumeration_name_feature = Name
-_UI_TEnumerations_enumeration_feature = Enumeration
-_UI_TFunctionalConstraint_applicableServices_feature = Applicable Services
-_UI_TFunctionalConstraint_abbreviation_feature = Abbreviation
-_UI_TFunctionalConstraint_descID_feature = Desc ID
-_UI_TFunctionalConstraint_titleID_feature = Title ID
-_UI_TFunctionalConstraints_functionalConstraint_feature = Functional Constraint
-_UI_TLicense_mixed_feature = Mixed
-_UI_TLicense_kind_feature = Kind
-_UI_TLicense_uri_feature = Uri
-_UI_TLiteral_literalVal_feature = Literal Val
-_UI_TLiteral_name_feature = Name
-_UI_TLNClass_canHaveLOG_feature = Can Have LOG
-_UI_TLNClass_isExtension_feature = Is Extension
-_UI_TLNClass_name_feature = Name
-_UI_TLNClasses_abstractLNClass_feature = Abstract LN Class
-_UI_TLNClasses_lNClass_feature = LN Class
-_UI_TNotice_mixed_feature = Mixed
-_UI_TNS_changes_feature = Changes
-_UI_TNS_dependsOn_feature = Depends On
-_UI_TNS_basicTypes_feature = Basic Types
-_UI_TNS_functionalConstraints_feature = Functional Constraints
-_UI_TNS_presenceConditions_feature = Presence Conditions
-_UI_TNS_abbreviations_feature = Abbreviations
-_UI_TNS_enumerations_feature = Enumerations
-_UI_TNS_constructedAttributes_feature = Constructed Attributes
-_UI_TNS_cDCs_feature = CD Cs
-_UI_TNS_lNClasses_feature = LN Classes
-_UI_TNS_descID_feature = Desc ID
-_UI_TNS_id_feature = Id
-_UI_TNS_publicationStage_feature = Publication Stage
-_UI_TNS_release_feature = Release
-_UI_TNS_revision_feature = Revision
-_UI_TNS_umlDate_feature = Uml Date
-_UI_TNS_umlVersion_feature = Uml Version
-_UI_TNS_version_feature = Version
-_UI_TNSDoc_doc_feature = Doc
-_UI_TNSDoc_id_feature = Id
-_UI_TNSDoc_lang_feature = Lang
-_UI_TNSDoc_publicationStage_feature = Publication Stage
-_UI_TNSDoc_release_feature = Release
-_UI_TNSDoc_revision_feature = Revision
-_UI_TNSDoc_umlDate_feature = Uml Date
-_UI_TNSDoc_umlVersion_feature = Uml Version
-_UI_TNSDoc_version_feature = Version
-_UI_TPresenceCondition_argument_feature = Argument
-_UI_TPresenceCondition_descID_feature = Desc ID
-_UI_TPresenceCondition_name_feature = Name
-_UI_TPresenceCondition_titleID_feature = Title ID
-_UI_TPresenceConditions_presenceCondition_feature = Presence Condition
-_UI_TServiceCDC_serviceDataAttribute_feature = Service Data Attribute
-_UI_TServiceCDC_cdc_feature = Cdc
-_UI_TServiceCDC_variant_feature = Variant
-_UI_TServiceCDCs_serviceCDC_feature = Service CDC
-_UI_TServiceConstructedAttribute_typeKindParameterized_feature = Type Kind Parameterized
-_UI_TServiceConstructedAttributes_serviceConstructedAttribute_feature = Service Constructed Attribute
-_UI_TServiceDataAttribute_fc_feature = Fc
-_UI_TServiceDataAttribute_name_feature = Name
-_UI_TServiceDataAttribute_presCond_feature = Pres Cond
-_UI_TServiceDataAttribute_presCondArgs_feature = Pres Cond Args
-_UI_TServiceDataAttribute_presCondArgsID_feature = Pres Cond Args ID
-_UI_TServiceDataAttribute_type_feature = Type
-_UI_TServiceDataAttribute_typeKind_feature = Type Kind
-_UI_TServiceDataAttribute_underlyingType_feature = Underlying Type
-_UI_TServiceDataAttribute_underlyingTypeKind_feature = Underlying Type Kind
-_UI_TServiceNS_changes_feature = Changes
-_UI_TServiceNS_functionalConstraints_feature = Functional Constraints
-_UI_TServiceNS_presenceConditions_feature = Presence Conditions
-_UI_TServiceNS_abbreviations_feature = Abbreviations
-_UI_TServiceNS_serviceTypeRealizations_feature = Service Type Realizations
-_UI_TServiceNS_serviceConstructedAttributes_feature = Service Constructed Attributes
-_UI_TServiceNS_serviceCDCs_feature = Service CD Cs
-_UI_TServiceNS_descID_feature = Desc ID
-_UI_TServiceNS_id_feature = Id
-_UI_TServiceNS_publicationStage_feature = Publication Stage
-_UI_TServiceNS_release_feature = Release
-_UI_TServiceNS_revision_feature = Revision
-_UI_TServiceNS_umlDate_feature = Uml Date
-_UI_TServiceNS_umlVersion_feature = Uml Version
-_UI_TServiceNS_version_feature = Version
-_UI_TServiceNsUsage_appliesTo_feature = Applies To
-_UI_TServiceNsUsage_id_feature = Id
-_UI_TServiceNsUsage_publicationStage_feature = Publication Stage
-_UI_TServiceNsUsage_release_feature = Release
-_UI_TServiceNsUsage_revision_feature = Revision
-_UI_TServiceNsUsage_version_feature = Version
-_UI_TServiceParameter_defaultValue_feature = Default Value
-_UI_TServiceParameter_maxValue_feature = Max Value
-_UI_TServiceParameter_minValue_feature = Min Value
-_UI_TServiceParameter_name_feature = Name
-_UI_TServiceParameter_type_feature = Type
-_UI_TServiceParameter_typeKind_feature = Type Kind
-_UI_TServiceTypeRealization_fc_feature = Fc
-_UI_TServiceTypeRealization_name_feature = Name
-_UI_TServiceTypeRealization_presCond_feature = Pres Cond
-_UI_TServiceTypeRealization_presCondArgs_feature = Pres Cond Args
-_UI_TServiceTypeRealization_presCondArgsID_feature = Pres Cond Args ID
-_UI_TServiceTypeRealization_type_feature = Type
-_UI_TServiceTypeRealization_typeKind_feature = Type Kind
-_UI_TServiceTypeRealizations_serviceTypeRealization_feature = Service Type Realization
-_UI_TSubDataAttribute_defaultValue_feature = Default Value
-_UI_TSubDataAttribute_isArray_feature = Is Array
-_UI_TSubDataAttribute_maxIndexAttribute_feature = Max Index Attribute
-_UI_TSubDataAttribute_maxValue_feature = Max Value
-_UI_TSubDataAttribute_minIndex_feature = Min Index
-_UI_TSubDataAttribute_minValue_feature = Min Value
-_UI_TSubDataAttribute_name_feature = Name
-_UI_TSubDataAttribute_presCond_feature = Pres Cond
-_UI_TSubDataAttribute_presCondArgs_feature = Pres Cond Args
-_UI_TSubDataAttribute_presCondArgsID_feature = Pres Cond Args ID
-_UI_TSubDataAttribute_sizeAttribute_feature = Size Attribute
-_UI_TSubDataAttribute_type_feature = Type
-_UI_TSubDataAttribute_typeKind_feature = Type Kind
-_UI_TSubDataObject_isArray_feature = Is Array
-_UI_TSubDataObject_maxIndexAttribute_feature = Max Index Attribute
-_UI_TSubDataObject_minIndex_feature = Min Index
-_UI_TSubDataObject_name_feature = Name
-_UI_TSubDataObject_presCond_feature = Pres Cond
-_UI_TSubDataObject_presCondArgs_feature = Pres Cond Args
-_UI_TSubDataObject_presCondArgsID_feature = Pres Cond Args ID
-_UI_TSubDataObject_sizeAttribute_feature = Size Attribute
-_UI_TSubDataObject_type_feature = Type
-_UI_TSubDataObject_underlyingType_feature = Underlying Type
-_UI_TSubDataObject_underlyingTypeKind_feature = Underlying Type Kind
-_UI_TTitledClass_titleID_feature = Title ID
+_UI_Abbreviation_descID_feature = Desc ID
+_UI_Abbreviation_name_feature = Name
+_UI_Abbreviations_abbreviation_feature = Abbreviation
+_UI_AbstractLNClass_name_feature = Name
+_UI_AnyLNClass_dataObject_feature = Data Object
+_UI_AnyLNClass_base_feature = Base
+_UI_ApplicableServiceNS_serviceNsUsage_feature = Service Ns Usage
+_UI_ApplicableServiceNS_date_feature = Date
+_UI_ApplicableServiceNS_version_feature = Version
+_UI_ApplicableServices_service_feature = Service
+_UI_ApplicableServices_dataSetMemberOf_feature = Data Set Member Of
+_UI_BasicType_descID_feature = Desc ID
+_UI_BasicType_name_feature = Name
+_UI_BasicTypes_basicType_feature = Basic Type
+_UI_CDC_subDataObject_feature = Sub Data Object
+_UI_CDC_dataAttribute_feature = Data Attribute
+_UI_CDC_serviceParameter_feature = Service Parameter
+_UI_CDC_enumParameterized_feature = Enum Parameterized
+_UI_CDC_name_feature = Name
+_UI_CDC_statistics_feature = Statistics
+_UI_CDC_typeKindParameterized_feature = Type Kind Parameterized
+_UI_CDC_variant_feature = Variant
+_UI_CDCs_cDC_feature = CDC
+_UI_Changes_changesID_feature = Changes ID
+_UI_Changes_date_feature = Date
+_UI_Changes_release_feature = Release
+_UI_Changes_revision_feature = Revision
+_UI_Changes_tissues_feature = Tissues
+_UI_Changes_version_feature = Version
+_UI_ConstructedAttribute_subDataAttribute_feature = Sub Data Attribute
+_UI_ConstructedAttribute_name_feature = Name
+_UI_ConstructedAttributes_constructedAttribute_feature = Constructed Attribute
+_UI_Copyrighted_copyright_feature = Copyright
+_UI_CopyrightNotice_notice_feature = Notice
+_UI_CopyrightNotice_license_feature = License
+_UI_DataAttribute_dchg_feature = Dchg
+_UI_DataAttribute_defaultValue_feature = Default Value
+_UI_DataAttribute_dupd_feature = Dupd
+_UI_DataAttribute_fc_feature = Fc
+_UI_DataAttribute_isArray_feature = Is Array
+_UI_DataAttribute_maxIndexAttribute_feature = Max Index Attribute
+_UI_DataAttribute_maxValue_feature = Max Value
+_UI_DataAttribute_minIndex_feature = Min Index
+_UI_DataAttribute_minValue_feature = Min Value
+_UI_DataAttribute_name_feature = Name
+_UI_DataAttribute_presCond_feature = Pres Cond
+_UI_DataAttribute_presCondArgs_feature = Pres Cond Args
+_UI_DataAttribute_presCondArgsID_feature = Pres Cond Args ID
+_UI_DataAttribute_qchg_feature = Qchg
+_UI_DataAttribute_sizeAttribute_feature = Size Attribute
+_UI_DataAttribute_type_feature = Type
+_UI_DataAttribute_typeKind_feature = Type Kind
+_UI_DataObject_dsPresCond_feature = Ds Pres Cond
+_UI_DataObject_dsPresCondArgs_feature = Ds Pres Cond Args
+_UI_DataObject_dsPresCondArgsID_feature = Ds Pres Cond Args ID
+_UI_DataObject_name_feature = Name
+_UI_DataObject_presCond_feature = Pres Cond
+_UI_DataObject_presCondArgs_feature = Pres Cond Args
+_UI_DataObject_presCondArgsID_feature = Pres Cond Args ID
+_UI_DataObject_transient_feature = Transient
+_UI_DataObject_type_feature = Type
+_UI_DataObject_underlyingType_feature = Underlying Type
+_UI_DataObject_underlyingTypeKind_feature = Underlying Type Kind
+_UI_DataSetMemberOf_cb_feature = Cb
+_UI_Doc_mixed_feature = Mixed
+_UI_Doc_group_feature = Group
+_UI_Doc_any_feature = Any
+_UI_Doc_id_feature = Id
+_UI_DocumentedClass_deprecated_feature = Deprecated
+_UI_DocumentedClass_descID_feature = Desc ID
+_UI_DocumentedClass_informative_feature = Informative
+_UI_Enumeration_literal_feature = Literal
+_UI_Enumeration_inheritedFrom_feature = Inherited From
+_UI_Enumeration_name_feature = Name
+_UI_Enumerations_enumeration_feature = Enumeration
+_UI_FunctionalConstraint_applicableServices_feature = Applicable Services
+_UI_FunctionalConstraint_abbreviation_feature = Abbreviation
+_UI_FunctionalConstraint_descID_feature = Desc ID
+_UI_FunctionalConstraint_titleID_feature = Title ID
+_UI_FunctionalConstraints_functionalConstraint_feature = Functional Constraint
+_UI_License_mixed_feature = Mixed
+_UI_License_kind_feature = Kind
+_UI_License_uri_feature = Uri
+_UI_Literal_literalVal_feature = Literal Val
+_UI_Literal_name_feature = Name
+_UI_LNClass_canHaveLOG_feature = Can Have LOG
+_UI_LNClass_isExtension_feature = Is Extension
+_UI_LNClass_name_feature = Name
+_UI_LNClasses_abstractLNClass_feature = Abstract LN Class
+_UI_LNClasses_lNClass_feature = LN Class
+_UI_Notice_mixed_feature = Mixed
+_UI_NS_changes_feature = Changes
+_UI_NS_dependsOn_feature = Depends On
+_UI_NS_basicTypes_feature = Basic Types
+_UI_NS_functionalConstraints_feature = Functional Constraints
+_UI_NS_presenceConditions_feature = Presence Conditions
+_UI_NS_abbreviations_feature = Abbreviations
+_UI_NS_enumerations_feature = Enumerations
+_UI_NS_constructedAttributes_feature = Constructed Attributes
+_UI_NS_cDCs_feature = CD Cs
+_UI_NS_lNClasses_feature = LN Classes
+_UI_NS_descID_feature = Desc ID
+_UI_NS_id_feature = Id
+_UI_NS_publicationStage_feature = Publication Stage
+_UI_NS_release_feature = Release
+_UI_NS_revision_feature = Revision
+_UI_NS_umlDate_feature = Uml Date
+_UI_NS_umlVersion_feature = Uml Version
+_UI_NS_version_feature = Version
+_UI_NSDoc_doc_feature = Doc
+_UI_NSDoc_id_feature = Id
+_UI_NSDoc_lang_feature = Lang
+_UI_NSDoc_publicationStage_feature = Publication Stage
+_UI_NSDoc_release_feature = Release
+_UI_NSDoc_revision_feature = Revision
+_UI_NSDoc_umlDate_feature = Uml Date
+_UI_NSDoc_umlVersion_feature = Uml Version
+_UI_NSDoc_version_feature = Version
+_UI_PresenceCondition_argument_feature = Argument
+_UI_PresenceCondition_descID_feature = Desc ID
+_UI_PresenceCondition_name_feature = Name
+_UI_PresenceCondition_titleID_feature = Title ID
+_UI_PresenceConditions_presenceCondition_feature = Presence Condition
+_UI_ServiceCDC_serviceDataAttribute_feature = Service Data Attribute
+_UI_ServiceCDC_cdc_feature = Cdc
+_UI_ServiceCDC_variant_feature = Variant
+_UI_ServiceCDCs_serviceCDC_feature = Service CDC
+_UI_ServiceConstructedAttribute_typeKindParameterized_feature = Type Kind Parameterized
+_UI_ServiceConstructedAttributes_serviceConstructedAttribute_feature = Service Constructed Attribute
+_UI_ServiceDataAttribute_fc_feature = Fc
+_UI_ServiceDataAttribute_name_feature = Name
+_UI_ServiceDataAttribute_presCond_feature = Pres Cond
+_UI_ServiceDataAttribute_presCondArgs_feature = Pres Cond Args
+_UI_ServiceDataAttribute_presCondArgsID_feature = Pres Cond Args ID
+_UI_ServiceDataAttribute_type_feature = Type
+_UI_ServiceDataAttribute_typeKind_feature = Type Kind
+_UI_ServiceDataAttribute_underlyingType_feature = Underlying Type
+_UI_ServiceDataAttribute_underlyingTypeKind_feature = Underlying Type Kind
+_UI_ServiceNS_changes_feature = Changes
+_UI_ServiceNS_functionalConstraints_feature = Functional Constraints
+_UI_ServiceNS_presenceConditions_feature = Presence Conditions
+_UI_ServiceNS_abbreviations_feature = Abbreviations
+_UI_ServiceNS_serviceTypeRealizations_feature = Service Type Realizations
+_UI_ServiceNS_serviceConstructedAttributes_feature = Service Constructed Attributes
+_UI_ServiceNS_serviceCDCs_feature = Service CD Cs
+_UI_ServiceNS_descID_feature = Desc ID
+_UI_ServiceNS_id_feature = Id
+_UI_ServiceNS_publicationStage_feature = Publication Stage
+_UI_ServiceNS_release_feature = Release
+_UI_ServiceNS_revision_feature = Revision
+_UI_ServiceNS_umlDate_feature = Uml Date
+_UI_ServiceNS_umlVersion_feature = Uml Version
+_UI_ServiceNS_version_feature = Version
+_UI_ServiceNsUsage_appliesTo_feature = Applies To
+_UI_ServiceNsUsage_id_feature = Id
+_UI_ServiceNsUsage_publicationStage_feature = Publication Stage
+_UI_ServiceNsUsage_release_feature = Release
+_UI_ServiceNsUsage_revision_feature = Revision
+_UI_ServiceNsUsage_version_feature = Version
+_UI_ServiceParameter_defaultValue_feature = Default Value
+_UI_ServiceParameter_maxValue_feature = Max Value
+_UI_ServiceParameter_minValue_feature = Min Value
+_UI_ServiceParameter_name_feature = Name
+_UI_ServiceParameter_type_feature = Type
+_UI_ServiceParameter_typeKind_feature = Type Kind
+_UI_ServiceTypeRealization_fc_feature = Fc
+_UI_ServiceTypeRealization_name_feature = Name
+_UI_ServiceTypeRealization_presCond_feature = Pres Cond
+_UI_ServiceTypeRealization_presCondArgs_feature = Pres Cond Args
+_UI_ServiceTypeRealization_presCondArgsID_feature = Pres Cond Args ID
+_UI_ServiceTypeRealization_type_feature = Type
+_UI_ServiceTypeRealization_typeKind_feature = Type Kind
+_UI_ServiceTypeRealizations_serviceTypeRealization_feature = Service Type Realization
+_UI_SubDataAttribute_defaultValue_feature = Default Value
+_UI_SubDataAttribute_isArray_feature = Is Array
+_UI_SubDataAttribute_maxIndexAttribute_feature = Max Index Attribute
+_UI_SubDataAttribute_maxValue_feature = Max Value
+_UI_SubDataAttribute_minIndex_feature = Min Index
+_UI_SubDataAttribute_minValue_feature = Min Value
+_UI_SubDataAttribute_name_feature = Name
+_UI_SubDataAttribute_presCond_feature = Pres Cond
+_UI_SubDataAttribute_presCondArgs_feature = Pres Cond Args
+_UI_SubDataAttribute_presCondArgsID_feature = Pres Cond Args ID
+_UI_SubDataAttribute_sizeAttribute_feature = Size Attribute
+_UI_SubDataAttribute_type_feature = Type
+_UI_SubDataAttribute_typeKind_feature = Type Kind
+_UI_SubDataObject_isArray_feature = Is Array
+_UI_SubDataObject_maxIndexAttribute_feature = Max Index Attribute
+_UI_SubDataObject_minIndex_feature = Min Index
+_UI_SubDataObject_name_feature = Name
+_UI_SubDataObject_presCond_feature = Pres Cond
+_UI_SubDataObject_presCondArgs_feature = Pres Cond Args
+_UI_SubDataObject_presCondArgsID_feature = Pres Cond Args ID
+_UI_SubDataObject_sizeAttribute_feature = Size Attribute
+_UI_SubDataObject_type_feature = Type
+_UI_SubDataObject_underlyingType_feature = Underlying Type
+_UI_SubDataObject_underlyingTypeKind_feature = Underlying Type Kind
+_UI_TitledClass_titleID_feature = Title ID
 _UI_XMLTypeDocumentRoot_comment_feature = Comment
 _UI_XMLTypeDocumentRoot_text_feature = Text
 _UI_XMLTypeDocumentRoot_processingInstruction_feature = Processing Instruction
 _UI_XMLTypeDocumentRoot_cDATA_feature = CDATA
 _UI_Unknown_feature = Unspecified
 
-_UI_TACSIServicesKind_Associate_literal = Associate
-_UI_TACSIServicesKind_Abort_literal = Abort
-_UI_TACSIServicesKind_Release_literal = Release
-_UI_TACSIServicesKind_GetServerDirectory_literal = GetServerDirectory
-_UI_TACSIServicesKind_GetLogicalDeviceDirectory_literal = GetLogicalDeviceDirectory
-_UI_TACSIServicesKind_GetAllDataValues_literal = GetAllDataValues
-_UI_TACSIServicesKind_GetDataValues_literal = GetDataValues
-_UI_TACSIServicesKind_SetDataValues_literal = SetDataValues
-_UI_TACSIServicesKind_GetDataDirectory_literal = GetDataDirectory
-_UI_TACSIServicesKind_GetDataDefinition_literal = GetDataDefinition
-_UI_TACSIServicesKind_GetDataSetValues_literal = GetDataSetValues
-_UI_TACSIServicesKind_SetDataSetValues_literal = SetDataSetValues
-_UI_TACSIServicesKind_CreateDataSet_literal = CreateDataSet
-_UI_TACSIServicesKind_DeleteDataSet_literal = DeleteDataSet
-_UI_TACSIServicesKind_GetDataSetDirectory_literal = GetDataSetDirectory
-_UI_TACSIServicesKind_SelectActiveSG_literal = SelectActiveSG
-_UI_TACSIServicesKind_SelectEditSG_literal = SelectEditSG
-_UI_TACSIServicesKind_SetEditSGValue_literal = SetEditSGValue
-_UI_TACSIServicesKind_ConfirmEditSGValues_literal = ConfirmEditSGValues
-_UI_TACSIServicesKind_GetEditSGValue_literal = GetEditSGValue
-_UI_TACSIServicesKind_GetSGCBValues_literal = GetSGCBValues
-_UI_TACSIServicesKind_Report_literal = Report
-_UI_TACSIServicesKind_GetBRCBValues_literal = GetBRCBValues
-_UI_TACSIServicesKind_SetBRCBValues_literal = SetBRCBValues
-_UI_TACSIServicesKind_GetURCBValues_literal = GetURCBValues
-_UI_TACSIServicesKind_SetURCBValues_literal = SetURCBValues
-_UI_TACSIServicesKind_GetLCBValues_literal = GetLCBValues
-_UI_TACSIServicesKind_SetLCBValues_literal = SetLCBValues
-_UI_TACSIServicesKind_QueryLogByTime_literal = QueryLogByTime
-_UI_TACSIServicesKind_QueryLogAfter_literal = QueryLogAfter
-_UI_TACSIServicesKind_GetLogStatusValues_literal = GetLogStatusValues
-_UI_TACSIServicesKind_SendGOOSEMessage_literal = SendGOOSEMessage
-_UI_TACSIServicesKind_GetGoCBValues_literal = GetGoCBValues
-_UI_TACSIServicesKind_SetGoCBValues_literal = SetGoCBValues
-_UI_TACSIServicesKind_GetGoReference_literal = GetGoReference
-_UI_TACSIServicesKind_GetGOOSEElementNumber_literal = GetGOOSEElementNumber
-_UI_TACSIServicesKind_SendMSVMessage_literal = SendMSVMessage
-_UI_TACSIServicesKind_GetMSVCBValues_literal = GetMSVCBValues
-_UI_TACSIServicesKind_SetMSVCBValues_literal = SetMSVCBValues
-_UI_TACSIServicesKind_SendUSVMessage_literal = SendUSVMessage
-_UI_TACSIServicesKind_GetUSVCBValues_literal = GetUSVCBValues
-_UI_TACSIServicesKind_SetUSVCBValues_literal = SetUSVCBValues
-_UI_TACSIServicesKind_Select_literal = Select
-_UI_TACSIServicesKind_SelectWithValue_literal = SelectWithValue
-_UI_TACSIServicesKind_Cancel_literal = Cancel
-_UI_TACSIServicesKind_Operate_literal = Operate
-_UI_TACSIServicesKind_CommandTermination_literal = CommandTermination
-_UI_TACSIServicesKind_TimeActivatedOperate_literal = TimeActivatedOperate
-_UI_TACSIServicesKind_GetFile_literal = GetFile
-_UI_TACSIServicesKind_SetFile_literal = SetFile
-_UI_TACSIServicesKind_DeleteFile_literal = DeleteFile
-_UI_TACSIServicesKind_GetFileAttributeValues_literal = GetFileAttributeValues
-_UI_TACSIServicesKind_TimeSynchronization_literal = TimeSynchronization
-_UI_TACSIServicesKind_InternalChange_literal = InternalChange
-_UI_TACSIServicesKind_GetLogicalNodeDirectory_literal = GetLogicalNodeDirectory
-_UI_TACSIServicesKind_GetMsvReference_literal = GetMsvReference
-_UI_TACSIServicesKind_GetMSVElementNumber_literal = GetMSVElementNumber
-_UI_TACSIServicesKind_GetUsvReference_literal = GetUsvReference
-_UI_TACSIServicesKind_GetUSVElementNumber_literal = GetUSVElementNumber
-_UI_TCBKind_RCB_literal = RCB
-_UI_TCBKind_LCB_literal = LCB
-_UI_TCBKind_GoCB_literal = GoCB
-_UI_TCBKind_SVCB_literal = SVCB
-_UI_TDefinedAttributeTypeKind_BASIC_literal = BASIC
-_UI_TDefinedAttributeTypeKind_ENUMERATED_literal = ENUMERATED
-_UI_TDefinedAttributeTypeKind_CONSTRUCTED_literal = CONSTRUCTED
-_UI_TLicenseKind_Standard_literal = Standard
-_UI_TLicenseKind_Private_literal = Private
-_UI_TLicenseKind_None_literal = None
-_UI_TPubStage_WD_literal = WD
-_UI_TPubStage_CD_literal = CD
-_UI_TPubStage_CDV_literal = CDV
-_UI_TPubStage_DTS_literal = DTS
-_UI_TPubStage_DTR_literal = DTR
-_UI_TPubStage_FDIS_literal = FDIS
-_UI_TPubStage_TS_literal = TS
-_UI_TPubStage_TR_literal = TR
-_UI_TPubStage_IS_literal = IS
-_UI_TUndefinedAttributeTypeKind_undefined_literal = undefined
+_UI_ACSIServicesKind_Associate_literal = Associate
+_UI_ACSIServicesKind_Abort_literal = Abort
+_UI_ACSIServicesKind_Release_literal = Release
+_UI_ACSIServicesKind_GetServerDirectory_literal = GetServerDirectory
+_UI_ACSIServicesKind_GetLogicalDeviceDirectory_literal = GetLogicalDeviceDirectory
+_UI_ACSIServicesKind_GetAllDataValues_literal = GetAllDataValues
+_UI_ACSIServicesKind_GetDataValues_literal = GetDataValues
+_UI_ACSIServicesKind_SetDataValues_literal = SetDataValues
+_UI_ACSIServicesKind_GetDataDirectory_literal = GetDataDirectory
+_UI_ACSIServicesKind_GetDataDefinition_literal = GetDataDefinition
+_UI_ACSIServicesKind_GetDataSetValues_literal = GetDataSetValues
+_UI_ACSIServicesKind_SetDataSetValues_literal = SetDataSetValues
+_UI_ACSIServicesKind_CreateDataSet_literal = CreateDataSet
+_UI_ACSIServicesKind_DeleteDataSet_literal = DeleteDataSet
+_UI_ACSIServicesKind_GetDataSetDirectory_literal = GetDataSetDirectory
+_UI_ACSIServicesKind_SelectActiveSG_literal = SelectActiveSG
+_UI_ACSIServicesKind_SelectEditSG_literal = SelectEditSG
+_UI_ACSIServicesKind_SetEditSGValue_literal = SetEditSGValue
+_UI_ACSIServicesKind_ConfirmEditSGValues_literal = ConfirmEditSGValues
+_UI_ACSIServicesKind_GetEditSGValue_literal = GetEditSGValue
+_UI_ACSIServicesKind_GetSGCBValues_literal = GetSGCBValues
+_UI_ACSIServicesKind_Report_literal = Report
+_UI_ACSIServicesKind_GetBRCBValues_literal = GetBRCBValues
+_UI_ACSIServicesKind_SetBRCBValues_literal = SetBRCBValues
+_UI_ACSIServicesKind_GetURCBValues_literal = GetURCBValues
+_UI_ACSIServicesKind_SetURCBValues_literal = SetURCBValues
+_UI_ACSIServicesKind_GetLCBValues_literal = GetLCBValues
+_UI_ACSIServicesKind_SetLCBValues_literal = SetLCBValues
+_UI_ACSIServicesKind_QueryLogByTime_literal = QueryLogByTime
+_UI_ACSIServicesKind_QueryLogAfter_literal = QueryLogAfter
+_UI_ACSIServicesKind_GetLogStatusValues_literal = GetLogStatusValues
+_UI_ACSIServicesKind_SendGOOSEMessage_literal = SendGOOSEMessage
+_UI_ACSIServicesKind_GetGoCBValues_literal = GetGoCBValues
+_UI_ACSIServicesKind_SetGoCBValues_literal = SetGoCBValues
+_UI_ACSIServicesKind_GetGoReference_literal = GetGoReference
+_UI_ACSIServicesKind_GetGOOSEElementNumber_literal = GetGOOSEElementNumber
+_UI_ACSIServicesKind_SendMSVMessage_literal = SendMSVMessage
+_UI_ACSIServicesKind_GetMSVCBValues_literal = GetMSVCBValues
+_UI_ACSIServicesKind_SetMSVCBValues_literal = SetMSVCBValues
+_UI_ACSIServicesKind_SendUSVMessage_literal = SendUSVMessage
+_UI_ACSIServicesKind_GetUSVCBValues_literal = GetUSVCBValues
+_UI_ACSIServicesKind_SetUSVCBValues_literal = SetUSVCBValues
+_UI_ACSIServicesKind_Select_literal = Select
+_UI_ACSIServicesKind_SelectWithValue_literal = SelectWithValue
+_UI_ACSIServicesKind_Cancel_literal = Cancel
+_UI_ACSIServicesKind_Operate_literal = Operate
+_UI_ACSIServicesKind_CommandTermination_literal = CommandTermination
+_UI_ACSIServicesKind_TimeActivatedOperate_literal = TimeActivatedOperate
+_UI_ACSIServicesKind_GetFile_literal = GetFile
+_UI_ACSIServicesKind_SetFile_literal = SetFile
+_UI_ACSIServicesKind_DeleteFile_literal = DeleteFile
+_UI_ACSIServicesKind_GetFileAttributeValues_literal = GetFileAttributeValues
+_UI_ACSIServicesKind_TimeSynchronization_literal = TimeSynchronization
+_UI_ACSIServicesKind_InternalChange_literal = InternalChange
+_UI_ACSIServicesKind_GetLogicalNodeDirectory_literal = GetLogicalNodeDirectory
+_UI_ACSIServicesKind_GetMsvReference_literal = GetMsvReference
+_UI_ACSIServicesKind_GetMSVElementNumber_literal = GetMSVElementNumber
+_UI_ACSIServicesKind_GetUsvReference_literal = GetUsvReference
+_UI_ACSIServicesKind_GetUSVElementNumber_literal = GetUSVElementNumber
+_UI_CBKind_RCB_literal = RCB
+_UI_CBKind_LCB_literal = LCB
+_UI_CBKind_GoCB_literal = GoCB
+_UI_CBKind_SVCB_literal = SVCB
+_UI_DefinedAttributeTypeKind_BASIC_literal = BASIC
+_UI_DefinedAttributeTypeKind_ENUMERATED_literal = ENUMERATED
+_UI_DefinedAttributeTypeKind_CONSTRUCTED_literal = CONSTRUCTED
+_UI_LicenseKind_Standard_literal = Standard
+_UI_LicenseKind_Private_literal = Private
+_UI_LicenseKind_None_literal = None
+_UI_PubStage_WD_literal = WD
+_UI_PubStage_CD_literal = CD
+_UI_PubStage_CDV_literal = CDV
+_UI_PubStage_DTS_literal = DTS
+_UI_PubStage_DTR_literal = DTR
+_UI_PubStage_FDIS_literal = FDIS
+_UI_PubStage_TS_literal = TS
+_UI_PubStage_TR_literal = TR
+_UI_PubStage_IS_literal = IS
+_UI_UndefinedAttributeTypeKind_undefined_literal = undefined
+_UI_NSDObjectWithVersionAndRelease_type = NSD Object With Version And Release
+_UI_NSDObjectWithVersionAndRelease_release_feature = Release
+_UI_NSDObjectWithVersionAndRelease_version_feature = Version
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAbbreviationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationItemProvider.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAbbreviationItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationItemProvider.java
index 498f66012e06416679f738f9699e4854ac44e43b..27813abc91ceeaad6b8a16171416eeb57405716e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAbbreviationItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationItemProvider.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation;
 
 import java.util.Collection;
 import java.util.List;
@@ -42,12 +42,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TAbbreviationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class AbbreviationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -55,7 +55,7 @@ public class TAbbreviationItemProvider extends ItemProviderAdapter implements IE
      * <!-- end-user-doc -->
      * @generated
      */
-    public TAbbreviationItemProvider( AdapterFactory adapterFactory ) {
+    public AbbreviationItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -85,10 +85,10 @@ public class TAbbreviationItemProvider extends ItemProviderAdapter implements IE
     protected void addDescIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TAbbreviation_descID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TAbbreviation_descID_feature",
-                                "_UI_TAbbreviation_type" ),
-                        NsdPackage.Literals.TABBREVIATION__DESC_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_Abbreviation_descID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Abbreviation_descID_feature",
+                                "_UI_Abbreviation_type" ),
+                        NsdPackage.Literals.ABBREVIATION__DESC_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -101,22 +101,22 @@ public class TAbbreviationItemProvider extends ItemProviderAdapter implements IE
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TAbbreviation_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TAbbreviation_name_feature",
-                                "_UI_TAbbreviation_type" ),
-                        NsdPackage.Literals.TABBREVIATION__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_Abbreviation_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Abbreviation_name_feature",
+                                "_UI_Abbreviation_type" ),
+                        NsdPackage.Literals.ABBREVIATION__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TAbbreviation.gif.
+     * This returns Abbreviation.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TAbbreviation" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Abbreviation" ) );
     }
 
     /**
@@ -127,9 +127,9 @@ public class TAbbreviationItemProvider extends ItemProviderAdapter implements IE
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TAbbreviation ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TAbbreviation_type" )
-                : getString( "_UI_TAbbreviation_type" ) + " " + label;
+        String label = ( ( Abbreviation ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Abbreviation_type" )
+                : getString( "_UI_Abbreviation_type" ) + " " + label;
     }
 
     /**
@@ -143,9 +143,9 @@ public class TAbbreviationItemProvider extends ItemProviderAdapter implements IE
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TAbbreviation.class ) ) {
-        case NsdPackage.TABBREVIATION__DESC_ID:
-        case NsdPackage.TABBREVIATION__NAME:
+        switch( notification.getFeatureID( Abbreviation.class ) ) {
+        case NsdPackage.ABBREVIATION__DESC_ID:
+        case NsdPackage.ABBREVIATION__NAME:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TEnumerationsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationsItemProvider.java
similarity index 88%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TEnumerationsItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationsItemProvider.java
index 4171f84ddeac755fb4b438a1bcf5a07c08278b4c..2c3de670a8b95091bbab3539fd53cf723f3ec0d3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TEnumerationsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationsItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TEnumerationsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class AbbreviationsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TEnumerationsItemProvider extends ItemProviderAdapter implements IE
      * <!-- end-user-doc -->
      * @generated
      */
-    public TEnumerationsItemProvider( AdapterFactory adapterFactory ) {
+    public AbbreviationsItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,7 +87,7 @@ public class TEnumerationsItemProvider extends ItemProviderAdapter implements IE
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TENUMERATIONS__ENUMERATION );
+            childrenFeatures.add( NsdPackage.Literals.ABBREVIATIONS__ABBREVIATION );
         }
         return childrenFeatures;
     }
@@ -106,14 +106,14 @@ public class TEnumerationsItemProvider extends ItemProviderAdapter implements IE
     }
 
     /**
-     * This returns TEnumerations.gif.
+     * This returns Abbreviations.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TEnumerations" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Abbreviations" ) );
     }
 
     /**
@@ -124,7 +124,7 @@ public class TEnumerationsItemProvider extends ItemProviderAdapter implements IE
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TEnumerations_type" );
+        return getString( "_UI_Abbreviations_type" );
     }
 
     /**
@@ -138,8 +138,8 @@ public class TEnumerationsItemProvider extends ItemProviderAdapter implements IE
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TEnumerations.class ) ) {
-        case NsdPackage.TENUMERATIONS__ENUMERATION:
+        switch( notification.getFeatureID( Abbreviations.class ) ) {
+        case NsdPackage.ABBREVIATIONS__ABBREVIATION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -157,8 +157,8 @@ public class TEnumerationsItemProvider extends ItemProviderAdapter implements IE
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TENUMERATIONS__ENUMERATION,
-                NsdFactory.eINSTANCE.createTEnumeration() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.ABBREVIATIONS__ABBREVIATION,
+                NsdFactory.eINSTANCE.createAbbreviation() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAbstractLNClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbstractLNClassItemProvider.java
similarity index 80%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAbstractLNClassItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbstractLNClassItemProvider.java
index 629ef0c168e31c08b3fc7d0abccd9a96db3b649d..5f921b21c3feb4f8423dfebbf0b292baec4320b1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAbstractLNClassItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbstractLNClassItemProvider.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TAbstractLNClassItemProvider extends TAnyLNClassItemProvider {
+public class AbstractLNClassItemProvider extends AnyLNClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TAbstractLNClassItemProvider( AdapterFactory adapterFactory ) {
+    public AbstractLNClassItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -75,22 +75,22 @@ public class TAbstractLNClassItemProvider extends TAnyLNClassItemProvider {
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TAbstractLNClass_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TAbstractLNClass_name_feature",
-                                "_UI_TAbstractLNClass_type" ),
-                        NsdPackage.Literals.TABSTRACT_LN_CLASS__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_AbstractLNClass_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractLNClass_name_feature",
+                                "_UI_AbstractLNClass_type" ),
+                        NsdPackage.Literals.ABSTRACT_LN_CLASS__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TAbstractLNClass.gif.
+     * This returns AbstractLNClass.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TAbstractLNClass" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/AbstractLNClass" ) );
     }
 
     /**
@@ -101,9 +101,9 @@ public class TAbstractLNClassItemProvider extends TAnyLNClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TAbstractLNClass ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TAbstractLNClass_type" )
-                : getString( "_UI_TAbstractLNClass_type" ) + " " + label;
+        String label = ( ( AbstractLNClass ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_AbstractLNClass_type" )
+                : getString( "_UI_AbstractLNClass_type" ) + " " + label;
     }
 
     /**
@@ -117,8 +117,8 @@ public class TAbstractLNClassItemProvider extends TAnyLNClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TAbstractLNClass.class ) ) {
-        case NsdPackage.TABSTRACT_LN_CLASS__NAME:
+        switch( notification.getFeatureID( AbstractLNClass.class ) ) {
+        case NsdPackage.ABSTRACT_LN_CLASS__NAME:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAnyLNClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AnyLNClassItemProvider.java
similarity index 83%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAnyLNClassItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AnyLNClassItemProvider.java
index a29a220c4801ba3d7a180603e61796f7369d624f..df20e75b9e672ea26f7262261d571daca58f486a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAnyLNClassItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AnyLNClassItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,19 +37,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TAnyLNClassItemProvider extends TTitledClassItemProvider {
+public class AnyLNClassItemProvider extends TitledClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TAnyLNClassItemProvider( AdapterFactory adapterFactory ) {
+    public AnyLNClassItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -78,10 +78,10 @@ public class TAnyLNClassItemProvider extends TTitledClassItemProvider {
     protected void addBasePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TAnyLNClass_base_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TAnyLNClass_base_feature",
-                                "_UI_TAnyLNClass_type" ),
-                        NsdPackage.Literals.TANY_LN_CLASS__BASE, true, false, false,
+                        getResourceLocator(), getString( "_UI_AnyLNClass_base_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AnyLNClass_base_feature",
+                                "_UI_AnyLNClass_type" ),
+                        NsdPackage.Literals.ANY_LN_CLASS__BASE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -97,7 +97,7 @@ public class TAnyLNClassItemProvider extends TTitledClassItemProvider {
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TANY_LN_CLASS__DATA_OBJECT );
+            childrenFeatures.add( NsdPackage.Literals.ANY_LN_CLASS__DATA_OBJECT );
         }
         return childrenFeatures;
     }
@@ -123,8 +123,8 @@ public class TAnyLNClassItemProvider extends TTitledClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        TAnyLNClass tAnyLNClass = ( TAnyLNClass ) object;
-        return getString( "_UI_TAnyLNClass_type" ) + " " + tAnyLNClass.isDeprecated();
+        AnyLNClass anyLNClass = ( AnyLNClass ) object;
+        return getString( "_UI_AnyLNClass_type" ) + " " + anyLNClass.isDeprecated();
     }
 
     /**
@@ -138,11 +138,11 @@ public class TAnyLNClassItemProvider extends TTitledClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TAnyLNClass.class ) ) {
-        case NsdPackage.TANY_LN_CLASS__BASE:
+        switch( notification.getFeatureID( AnyLNClass.class ) ) {
+        case NsdPackage.ANY_LN_CLASS__BASE:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TANY_LN_CLASS__DATA_OBJECT:
+        case NsdPackage.ANY_LN_CLASS__DATA_OBJECT:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -160,8 +160,8 @@ public class TAnyLNClassItemProvider extends TTitledClassItemProvider {
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TANY_LN_CLASS__DATA_OBJECT,
-                NsdFactory.eINSTANCE.createTDataObject() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.ANY_LN_CLASS__DATA_OBJECT,
+                NsdFactory.eINSTANCE.createDataObject() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TApplicableServiceNSItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServiceNSItemProvider.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TApplicableServiceNSItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServiceNSItemProvider.java
index afe74ab4d5e4f6425a853c5f9f775da5c77e96d9..f30ebfd3edd2d116993577611073caf1417489be 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TApplicableServiceNSItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServiceNSItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS;
 
 import java.util.Collection;
 import java.util.List;
@@ -39,19 +39,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TApplicableServiceNSItemProvider extends TCopyrightedItemProvider {
+public class ApplicableServiceNSItemProvider extends CopyrightedItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TApplicableServiceNSItemProvider( AdapterFactory adapterFactory ) {
+    public ApplicableServiceNSItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -81,10 +81,10 @@ public class TApplicableServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void addDatePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TApplicableServiceNS_date_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TApplicableServiceNS_date_feature",
-                                "_UI_TApplicableServiceNS_type" ),
-                        NsdPackage.Literals.TAPPLICABLE_SERVICE_NS__DATE, true, false, false,
+                        getResourceLocator(), getString( "_UI_ApplicableServiceNS_date_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ApplicableServiceNS_date_feature",
+                                "_UI_ApplicableServiceNS_type" ),
+                        NsdPackage.Literals.APPLICABLE_SERVICE_NS__DATE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -97,10 +97,10 @@ public class TApplicableServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void addVersionPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TApplicableServiceNS_version_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TApplicableServiceNS_version_feature",
-                                "_UI_TApplicableServiceNS_type" ),
-                        NsdPackage.Literals.TAPPLICABLE_SERVICE_NS__VERSION, true, false, false,
+                        getResourceLocator(), getString( "_UI_ApplicableServiceNS_version_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ApplicableServiceNS_version_feature",
+                                "_UI_ApplicableServiceNS_type" ),
+                        NsdPackage.Literals.APPLICABLE_SERVICE_NS__VERSION, true, false, false,
                         ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
     }
 
@@ -116,7 +116,7 @@ public class TApplicableServiceNSItemProvider extends TCopyrightedItemProvider {
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE );
+            childrenFeatures.add( NsdPackage.Literals.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE );
         }
         return childrenFeatures;
     }
@@ -135,14 +135,14 @@ public class TApplicableServiceNSItemProvider extends TCopyrightedItemProvider {
     }
 
     /**
-     * This returns TApplicableServiceNS.gif.
+     * This returns ApplicableServiceNS.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TApplicableServiceNS" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ApplicableServiceNS" ) );
     }
 
     /**
@@ -153,10 +153,10 @@ public class TApplicableServiceNSItemProvider extends TCopyrightedItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        XMLGregorianCalendar labelValue = ( ( TApplicableServiceNS ) object ).getDate();
+        XMLGregorianCalendar labelValue = ( ( ApplicableServiceNS ) object ).getDate();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString( "_UI_TApplicableServiceNS_type" )
-                : getString( "_UI_TApplicableServiceNS_type" ) + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_ApplicableServiceNS_type" )
+                : getString( "_UI_ApplicableServiceNS_type" ) + " " + label;
     }
 
     /**
@@ -170,12 +170,12 @@ public class TApplicableServiceNSItemProvider extends TCopyrightedItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TApplicableServiceNS.class ) ) {
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__DATE:
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__VERSION:
+        switch( notification.getFeatureID( ApplicableServiceNS.class ) ) {
+        case NsdPackage.APPLICABLE_SERVICE_NS__DATE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__VERSION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -193,8 +193,8 @@ public class TApplicableServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE,
-                NsdFactory.eINSTANCE.createTServiceNsUsage() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE,
+                NsdFactory.eINSTANCE.createServiceNsUsage() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TApplicableServicesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServicesItemProvider.java
similarity index 84%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TApplicableServicesItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServicesItemProvider.java
index d6a453b2132e83ba53574ad4e72651e6be556ca1..a0a474e26d30c1e7ced2854e3ad1ac5845ccdc81 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TApplicableServicesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServicesItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TApplicableServicesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class ApplicableServicesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TApplicableServicesItemProvider extends ItemProviderAdapter impleme
      * <!-- end-user-doc -->
      * @generated
      */
-    public TApplicableServicesItemProvider( AdapterFactory adapterFactory ) {
+    public ApplicableServicesItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,8 +87,8 @@ public class TApplicableServicesItemProvider extends ItemProviderAdapter impleme
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TAPPLICABLE_SERVICES__SERVICE );
-            childrenFeatures.add( NsdPackage.Literals.TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF );
+            childrenFeatures.add( NsdPackage.Literals.APPLICABLE_SERVICES__SERVICE );
+            childrenFeatures.add( NsdPackage.Literals.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF );
         }
         return childrenFeatures;
     }
@@ -107,14 +107,14 @@ public class TApplicableServicesItemProvider extends ItemProviderAdapter impleme
     }
 
     /**
-     * This returns TApplicableServices.gif.
+     * This returns ApplicableServices.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TApplicableServices" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ApplicableServices" ) );
     }
 
     /**
@@ -125,7 +125,7 @@ public class TApplicableServicesItemProvider extends ItemProviderAdapter impleme
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TApplicableServices_type" );
+        return getString( "_UI_ApplicableServices_type" );
     }
 
     /**
@@ -139,9 +139,9 @@ public class TApplicableServicesItemProvider extends ItemProviderAdapter impleme
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TApplicableServices.class ) ) {
-        case NsdPackage.TAPPLICABLE_SERVICES__SERVICE:
-        case NsdPackage.TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
+        switch( notification.getFeatureID( ApplicableServices.class ) ) {
+        case NsdPackage.APPLICABLE_SERVICES__SERVICE:
+        case NsdPackage.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -159,11 +159,11 @@ public class TApplicableServicesItemProvider extends ItemProviderAdapter impleme
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TAPPLICABLE_SERVICES__SERVICE,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.APPLICABLE_SERVICES__SERVICE,
                 NsdFactory.eINSTANCE.createServiceType() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF,
-                NsdFactory.eINSTANCE.createTDataSetMemberOf() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF,
+                NsdFactory.eINSTANCE.createDataSetMemberOf() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AppliesToTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AppliesToTypeItemProvider.java
index 5b3ffed8ee96dc9223ff50c2c3d0a4cc47149027..f52266daac5967aabfe80748ed1500594c6af8f9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AppliesToTypeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AppliesToTypeItemProvider.java
@@ -27,18 +27,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
@@ -47,8 +38,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AppliesToTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class AppliesToTypeItemProvider extends NSDObjectWithVersionAndReleaseItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
@@ -72,9 +62,7 @@ public class AppliesToTypeItemProvider extends ItemProviderAdapter implements IE
 
             addIdPropertyDescriptor( object );
             addPublicationStagePropertyDescriptor( object );
-            addReleasePropertyDescriptor( object );
             addRevisionPropertyDescriptor( object );
-            addVersionPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -111,22 +99,6 @@ public class AppliesToTypeItemProvider extends ItemProviderAdapter implements IE
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
-    /**
-     * This adds a property descriptor for the Release feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addReleasePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_AppliesToType_release_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_AppliesToType_release_feature",
-                                "_UI_AppliesToType_type" ),
-                        NsdPackage.Literals.APPLIES_TO_TYPE__RELEASE, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
-    }
-
     /**
      * This adds a property descriptor for the Revision feature.
      * <!-- begin-user-doc -->
@@ -143,22 +115,6 @@ public class AppliesToTypeItemProvider extends ItemProviderAdapter implements IE
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
-    /**
-     * This adds a property descriptor for the Version feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addVersionPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_AppliesToType_version_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_AppliesToType_version_feature",
-                                "_UI_AppliesToType_type" ),
-                        NsdPackage.Literals.APPLIES_TO_TYPE__VERSION, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
-    }
-
     /**
      * This returns AppliesToType.gif.
      * <!-- begin-user-doc -->
@@ -197,9 +153,7 @@ public class AppliesToTypeItemProvider extends ItemProviderAdapter implements IE
         switch( notification.getFeatureID( AppliesToType.class ) ) {
         case NsdPackage.APPLIES_TO_TYPE__ID:
         case NsdPackage.APPLIES_TO_TYPE__PUBLICATION_STAGE:
-        case NsdPackage.APPLIES_TO_TYPE__RELEASE:
         case NsdPackage.APPLIES_TO_TYPE__REVISION:
-        case NsdPackage.APPLIES_TO_TYPE__VERSION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
@@ -218,15 +172,4 @@ public class AppliesToTypeItemProvider extends ItemProviderAdapter implements IE
         super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
-    /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return NSDEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TBasicTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypeItemProvider.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TBasicTypeItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypeItemProvider.java
index 50cf4ada4f5c0fdaefccf8ea6092cb73b6d46b76..f0ad3db9fefc6379892ba27395e30adacb06bc5e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TBasicTypeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypeItemProvider.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType;
 
 import java.util.Collection;
 import java.util.List;
@@ -42,12 +42,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TBasicTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class BasicTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -55,7 +55,7 @@ public class TBasicTypeItemProvider extends ItemProviderAdapter implements IEdit
      * <!-- end-user-doc -->
      * @generated
      */
-    public TBasicTypeItemProvider( AdapterFactory adapterFactory ) {
+    public BasicTypeItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -85,10 +85,10 @@ public class TBasicTypeItemProvider extends ItemProviderAdapter implements IEdit
     protected void addDescIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TBasicType_descID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TBasicType_descID_feature",
-                                "_UI_TBasicType_type" ),
-                        NsdPackage.Literals.TBASIC_TYPE__DESC_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_BasicType_descID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_BasicType_descID_feature",
+                                "_UI_BasicType_type" ),
+                        NsdPackage.Literals.BASIC_TYPE__DESC_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -101,22 +101,22 @@ public class TBasicTypeItemProvider extends ItemProviderAdapter implements IEdit
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TBasicType_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TBasicType_name_feature",
-                                "_UI_TBasicType_type" ),
-                        NsdPackage.Literals.TBASIC_TYPE__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_BasicType_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_BasicType_name_feature",
+                                "_UI_BasicType_type" ),
+                        NsdPackage.Literals.BASIC_TYPE__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TBasicType.gif.
+     * This returns BasicType.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TBasicType" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/BasicType" ) );
     }
 
     /**
@@ -127,9 +127,9 @@ public class TBasicTypeItemProvider extends ItemProviderAdapter implements IEdit
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TBasicType ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TBasicType_type" )
-                : getString( "_UI_TBasicType_type" ) + " " + label;
+        String label = ( ( BasicType ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_BasicType_type" )
+                : getString( "_UI_BasicType_type" ) + " " + label;
     }
 
     /**
@@ -143,9 +143,9 @@ public class TBasicTypeItemProvider extends ItemProviderAdapter implements IEdit
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TBasicType.class ) ) {
-        case NsdPackage.TBASIC_TYPE__DESC_ID:
-        case NsdPackage.TBASIC_TYPE__NAME:
+        switch( notification.getFeatureID( BasicType.class ) ) {
+        case NsdPackage.BASIC_TYPE__DESC_ID:
+        case NsdPackage.BASIC_TYPE__NAME:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceCDCsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypesItemProvider.java
similarity index 87%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceCDCsItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypesItemProvider.java
index af0695a9362c87d53ec9e9601cd0bd5746d85bce..7b09260b2eeed488520beed2f3d645dc0577c12b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceCDCsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypesItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TServiceCDCsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class BasicTypesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TServiceCDCsItemProvider extends ItemProviderAdapter implements IEd
      * <!-- end-user-doc -->
      * @generated
      */
-    public TServiceCDCsItemProvider( AdapterFactory adapterFactory ) {
+    public BasicTypesItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,7 +87,7 @@ public class TServiceCDCsItemProvider extends ItemProviderAdapter implements IEd
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_CD_CS__SERVICE_CDC );
+            childrenFeatures.add( NsdPackage.Literals.BASIC_TYPES__BASIC_TYPE );
         }
         return childrenFeatures;
     }
@@ -106,14 +106,14 @@ public class TServiceCDCsItemProvider extends ItemProviderAdapter implements IEd
     }
 
     /**
-     * This returns TServiceCDCs.gif.
+     * This returns BasicTypes.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceCDCs" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/BasicTypes" ) );
     }
 
     /**
@@ -124,7 +124,7 @@ public class TServiceCDCsItemProvider extends ItemProviderAdapter implements IEd
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TServiceCDCs_type" );
+        return getString( "_UI_BasicTypes_type" );
     }
 
     /**
@@ -138,8 +138,8 @@ public class TServiceCDCsItemProvider extends ItemProviderAdapter implements IEd
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TServiceCDCs.class ) ) {
-        case NsdPackage.TSERVICE_CD_CS__SERVICE_CDC:
+        switch( notification.getFeatureID( BasicTypes.class ) ) {
+        case NsdPackage.BASIC_TYPES__BASIC_TYPE:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -157,8 +157,8 @@ public class TServiceCDCsItemProvider extends ItemProviderAdapter implements IEd
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_CD_CS__SERVICE_CDC,
-                NsdFactory.eINSTANCE.createTServiceCDC() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.BASIC_TYPES__BASIC_TYPE,
+                NsdFactory.eINSTANCE.createBasicType() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCDCItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCItemProvider.java
similarity index 74%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCDCItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCItemProvider.java
index c4bd4b08d795c395692bd67e0f8ceac29c70d92d..07425a24cd4c36984ad0932c8badec8f359e89ec 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCDCItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,19 +37,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TCDCItemProvider extends TTitledClassItemProvider {
+public class CDCItemProvider extends TitledClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TCDCItemProvider( AdapterFactory adapterFactory ) {
+    public CDCItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -82,10 +82,10 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
     protected void addEnumParameterizedPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TCDC_enumParameterized_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TCDC_enumParameterized_feature",
-                                "_UI_TCDC_type" ),
-                        NsdPackage.Literals.TCDC__ENUM_PARAMETERIZED, true, false, false,
+                        getResourceLocator(), getString( "_UI_CDC_enumParameterized_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_CDC_enumParameterized_feature",
+                                "_UI_CDC_type" ),
+                        NsdPackage.Literals.CDC__ENUM_PARAMETERIZED, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -98,9 +98,9 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TCDC_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TCDC_name_feature", "_UI_TCDC_type" ),
-                        NsdPackage.Literals.TCDC__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getResourceLocator(), getString( "_UI_CDC_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_CDC_name_feature", "_UI_CDC_type" ),
+                        NsdPackage.Literals.CDC__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
                         null, null ) );
     }
 
@@ -113,10 +113,9 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
     protected void addStatisticsPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TCDC_statistics_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TCDC_statistics_feature",
-                                "_UI_TCDC_type" ),
-                        NsdPackage.Literals.TCDC__STATISTICS, true, false, false,
+                        getResourceLocator(), getString( "_UI_CDC_statistics_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_CDC_statistics_feature", "_UI_CDC_type" ),
+                        NsdPackage.Literals.CDC__STATISTICS, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -129,10 +128,10 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
     protected void addTypeKindParameterizedPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TCDC_typeKindParameterized_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TCDC_typeKindParameterized_feature",
-                                "_UI_TCDC_type" ),
-                        NsdPackage.Literals.TCDC__TYPE_KIND_PARAMETERIZED, true, false, false,
+                        getResourceLocator(), getString( "_UI_CDC_typeKindParameterized_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_CDC_typeKindParameterized_feature",
+                                "_UI_CDC_type" ),
+                        NsdPackage.Literals.CDC__TYPE_KIND_PARAMETERIZED, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -145,9 +144,9 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
     protected void addVariantPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TCDC_variant_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TCDC_variant_feature", "_UI_TCDC_type" ),
-                        NsdPackage.Literals.TCDC__VARIANT, true, false, false,
+                        getResourceLocator(), getString( "_UI_CDC_variant_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_CDC_variant_feature", "_UI_CDC_type" ),
+                        NsdPackage.Literals.CDC__VARIANT, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -163,9 +162,9 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TCDC__SUB_DATA_OBJECT );
-            childrenFeatures.add( NsdPackage.Literals.TCDC__DATA_ATTRIBUTE );
-            childrenFeatures.add( NsdPackage.Literals.TCDC__SERVICE_PARAMETER );
+            childrenFeatures.add( NsdPackage.Literals.CDC__SUB_DATA_OBJECT );
+            childrenFeatures.add( NsdPackage.Literals.CDC__DATA_ATTRIBUTE );
+            childrenFeatures.add( NsdPackage.Literals.CDC__SERVICE_PARAMETER );
         }
         return childrenFeatures;
     }
@@ -184,14 +183,14 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
     }
 
     /**
-     * This returns TCDC.gif.
+     * This returns CDC.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TCDC" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/CDC" ) );
     }
 
     /**
@@ -202,9 +201,9 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TCDC ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TCDC_type" )
-                : getString( "_UI_TCDC_type" ) + " " + label;
+        String label = ( ( CDC ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_CDC_type" )
+                : getString( "_UI_CDC_type" ) + " " + label;
     }
 
     /**
@@ -218,17 +217,17 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TCDC.class ) ) {
-        case NsdPackage.TCDC__ENUM_PARAMETERIZED:
-        case NsdPackage.TCDC__NAME:
-        case NsdPackage.TCDC__STATISTICS:
-        case NsdPackage.TCDC__TYPE_KIND_PARAMETERIZED:
-        case NsdPackage.TCDC__VARIANT:
+        switch( notification.getFeatureID( CDC.class ) ) {
+        case NsdPackage.CDC__ENUM_PARAMETERIZED:
+        case NsdPackage.CDC__NAME:
+        case NsdPackage.CDC__STATISTICS:
+        case NsdPackage.CDC__TYPE_KIND_PARAMETERIZED:
+        case NsdPackage.CDC__VARIANT:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TCDC__SUB_DATA_OBJECT:
-        case NsdPackage.TCDC__DATA_ATTRIBUTE:
-        case NsdPackage.TCDC__SERVICE_PARAMETER:
+        case NsdPackage.CDC__SUB_DATA_OBJECT:
+        case NsdPackage.CDC__DATA_ATTRIBUTE:
+        case NsdPackage.CDC__SERVICE_PARAMETER:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -246,14 +245,14 @@ public class TCDCItemProvider extends TTitledClassItemProvider {
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TCDC__SUB_DATA_OBJECT,
-                NsdFactory.eINSTANCE.createTSubDataObject() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.CDC__SUB_DATA_OBJECT,
+                NsdFactory.eINSTANCE.createSubDataObject() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TCDC__DATA_ATTRIBUTE,
-                NsdFactory.eINSTANCE.createTDataAttribute() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.CDC__DATA_ATTRIBUTE,
+                NsdFactory.eINSTANCE.createDataAttribute() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TCDC__SERVICE_PARAMETER,
-                NsdFactory.eINSTANCE.createTServiceParameter() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.CDC__SERVICE_PARAMETER,
+                NsdFactory.eINSTANCE.createServiceParameter() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCDCsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCsItemProvider.java
similarity index 89%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCDCsItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCsItemProvider.java
index 4b69e5dee1bdeda14fd30fee3337937e1e966be0..4a8c28970835f93eb0ac8612c90b509b2bd7dc63 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCDCsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCsItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TCDCsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class CDCsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TCDCsItemProvider extends ItemProviderAdapter implements IEditingDo
      * <!-- end-user-doc -->
      * @generated
      */
-    public TCDCsItemProvider( AdapterFactory adapterFactory ) {
+    public CDCsItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,7 +87,7 @@ public class TCDCsItemProvider extends ItemProviderAdapter implements IEditingDo
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TCD_CS__CDC );
+            childrenFeatures.add( NsdPackage.Literals.CD_CS__CDC );
         }
         return childrenFeatures;
     }
@@ -106,14 +106,14 @@ public class TCDCsItemProvider extends ItemProviderAdapter implements IEditingDo
     }
 
     /**
-     * This returns TCDCs.gif.
+     * This returns CDCs.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TCDCs" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/CDCs" ) );
     }
 
     /**
@@ -124,7 +124,7 @@ public class TCDCsItemProvider extends ItemProviderAdapter implements IEditingDo
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TCDCs_type" );
+        return getString( "_UI_CDCs_type" );
     }
 
     /**
@@ -138,8 +138,8 @@ public class TCDCsItemProvider extends ItemProviderAdapter implements IEditingDo
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TCDCs.class ) ) {
-        case NsdPackage.TCD_CS__CDC:
+        switch( notification.getFeatureID( CDCs.class ) ) {
+        case NsdPackage.CD_CS__CDC:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -158,7 +158,7 @@ public class TCDCsItemProvider extends ItemProviderAdapter implements IEditingDo
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.TCD_CS__CDC, NsdFactory.eINSTANCE.createTCDC() ) );
+                .add( createChildParameter( NsdPackage.Literals.CD_CS__CDC, NsdFactory.eINSTANCE.createCDC() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ChangesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ChangesItemProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..512b0926c411606f37ae7a21426f32b0dc6aa1b4
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ChangesItemProvider.java
@@ -0,0 +1,194 @@
+/**
+ *  Copyright (c) 2019 CentraleSupélec & EDF.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ * 
+ */
+package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
+
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ChangesItemProvider extends NSDObjectWithVersionAndReleaseItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public ChangesItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addChangesIDPropertyDescriptor( object );
+            addDatePropertyDescriptor( object );
+            addRevisionPropertyDescriptor( object );
+            addTissuesPropertyDescriptor( object );
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the Changes ID feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addChangesIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_Changes_changesID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Changes_changesID_feature",
+                                "_UI_Changes_type" ),
+                        NsdPackage.Literals.CHANGES__CHANGES_ID, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+    }
+
+    /**
+     * This adds a property descriptor for the Date feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addDatePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_Changes_date_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Changes_date_feature",
+                                "_UI_Changes_type" ),
+                        NsdPackage.Literals.CHANGES__DATE, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+    }
+
+    /**
+     * This adds a property descriptor for the Revision feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addRevisionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_Changes_revision_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Changes_revision_feature",
+                                "_UI_Changes_type" ),
+                        NsdPackage.Literals.CHANGES__REVISION, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+    }
+
+    /**
+     * This adds a property descriptor for the Tissues feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addTissuesPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_Changes_tissues_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Changes_tissues_feature",
+                                "_UI_Changes_type" ),
+                        NsdPackage.Literals.CHANGES__TISSUES, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+    }
+
+    /**
+     * This returns Changes.gif.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Changes" ) );
+    }
+
+    /**
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String getText( Object object ) {
+        Integer labelValue = ( ( Changes ) object ).getRelease();
+        String label = labelValue == null ? null : labelValue.toString();
+        return label == null || label.length() == 0 ? getString( "_UI_Changes_type" )
+                : getString( "_UI_Changes_type" ) + " " + label;
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Changes.class ) ) {
+        case NsdPackage.CHANGES__CHANGES_ID:
+        case NsdPackage.CHANGES__DATE:
+        case NsdPackage.CHANGES__REVISION:
+        case NsdPackage.CHANGES__TISSUES:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        }
+        super.notifyChanged( notification );
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+    }
+
+}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TConstructedAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributeItemProvider.java
similarity index 80%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TConstructedAttributeItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributeItemProvider.java
index 5223b0c6eaccd2b863210fdfb1ec9c84566ff9dc..c4e6523654982d6e7c367a9efbfb72b704019839 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TConstructedAttributeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributeItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,19 +37,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TConstructedAttributeItemProvider extends TTitledClassItemProvider {
+public class ConstructedAttributeItemProvider extends TitledClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TConstructedAttributeItemProvider( AdapterFactory adapterFactory ) {
+    public ConstructedAttributeItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -78,10 +78,10 @@ public class TConstructedAttributeItemProvider extends TTitledClassItemProvider
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TConstructedAttribute_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TConstructedAttribute_name_feature",
-                                "_UI_TConstructedAttribute_type" ),
-                        NsdPackage.Literals.TCONSTRUCTED_ATTRIBUTE__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_ConstructedAttribute_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConstructedAttribute_name_feature",
+                                "_UI_ConstructedAttribute_type" ),
+                        NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -97,7 +97,7 @@ public class TConstructedAttributeItemProvider extends TTitledClassItemProvider
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE );
+            childrenFeatures.add( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE );
         }
         return childrenFeatures;
     }
@@ -116,14 +116,14 @@ public class TConstructedAttributeItemProvider extends TTitledClassItemProvider
     }
 
     /**
-     * This returns TConstructedAttribute.gif.
+     * This returns ConstructedAttribute.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TConstructedAttribute" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConstructedAttribute" ) );
     }
 
     /**
@@ -134,9 +134,9 @@ public class TConstructedAttributeItemProvider extends TTitledClassItemProvider
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TConstructedAttribute ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TConstructedAttribute_type" )
-                : getString( "_UI_TConstructedAttribute_type" ) + " " + label;
+        String label = ( ( ConstructedAttribute ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_ConstructedAttribute_type" )
+                : getString( "_UI_ConstructedAttribute_type" ) + " " + label;
     }
 
     /**
@@ -150,11 +150,11 @@ public class TConstructedAttributeItemProvider extends TTitledClassItemProvider
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TConstructedAttribute.class ) ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__NAME:
+        switch( notification.getFeatureID( ConstructedAttribute.class ) ) {
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -172,8 +172,8 @@ public class TConstructedAttributeItemProvider extends TTitledClassItemProvider
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE,
-                NsdFactory.eINSTANCE.createTSubDataAttribute() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE,
+                NsdFactory.eINSTANCE.createSubDataAttribute() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TConstructedAttributesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributesItemProvider.java
similarity index 84%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TConstructedAttributesItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributesItemProvider.java
index 770b87cc3b0d369fd8d92b5e22c1a106e8f10265..332b0289d81e02bc5d2d47f436f778bd3fbc19d1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TConstructedAttributesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributesItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TConstructedAttributesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class ConstructedAttributesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TConstructedAttributesItemProvider extends ItemProviderAdapter impl
      * <!-- end-user-doc -->
      * @generated
      */
-    public TConstructedAttributesItemProvider( AdapterFactory adapterFactory ) {
+    public ConstructedAttributesItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,7 +87,7 @@ public class TConstructedAttributesItemProvider extends ItemProviderAdapter impl
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE );
+            childrenFeatures.add( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE );
         }
         return childrenFeatures;
     }
@@ -106,14 +106,14 @@ public class TConstructedAttributesItemProvider extends ItemProviderAdapter impl
     }
 
     /**
-     * This returns TConstructedAttributes.gif.
+     * This returns ConstructedAttributes.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TConstructedAttributes" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConstructedAttributes" ) );
     }
 
     /**
@@ -124,7 +124,7 @@ public class TConstructedAttributesItemProvider extends ItemProviderAdapter impl
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TConstructedAttributes_type" );
+        return getString( "_UI_ConstructedAttributes_type" );
     }
 
     /**
@@ -138,8 +138,8 @@ public class TConstructedAttributesItemProvider extends ItemProviderAdapter impl
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TConstructedAttributes.class ) ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
+        switch( notification.getFeatureID( ConstructedAttributes.class ) ) {
+        case NsdPackage.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -158,12 +158,12 @@ public class TConstructedAttributesItemProvider extends ItemProviderAdapter impl
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE,
-                        NsdFactory.eINSTANCE.createTConstructedAttribute() ) );
+                .add( createChildParameter( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE,
+                        NsdFactory.eINSTANCE.createConstructedAttribute() ) );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE,
-                        NsdFactory.eINSTANCE.createTServiceConstructedAttribute() ) );
+                .add( createChildParameter( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE,
+                        NsdFactory.eINSTANCE.createServiceConstructedAttribute() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCopyrightNoticeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CopyrightNoticeItemProvider.java
similarity index 84%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCopyrightNoticeItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CopyrightNoticeItemProvider.java
index cb8d8bb8d748e5f69eb9d92b0e427decf596c925..98ce8e7aa91223091a35e7c6bab0e88a5ae8d245 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCopyrightNoticeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CopyrightNoticeItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TCopyrightNoticeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class CopyrightNoticeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TCopyrightNoticeItemProvider extends ItemProviderAdapter implements
      * <!-- end-user-doc -->
      * @generated
      */
-    public TCopyrightNoticeItemProvider( AdapterFactory adapterFactory ) {
+    public CopyrightNoticeItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,8 +87,8 @@ public class TCopyrightNoticeItemProvider extends ItemProviderAdapter implements
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TCOPYRIGHT_NOTICE__NOTICE );
-            childrenFeatures.add( NsdPackage.Literals.TCOPYRIGHT_NOTICE__LICENSE );
+            childrenFeatures.add( NsdPackage.Literals.COPYRIGHT_NOTICE__NOTICE );
+            childrenFeatures.add( NsdPackage.Literals.COPYRIGHT_NOTICE__LICENSE );
         }
         return childrenFeatures;
     }
@@ -107,14 +107,14 @@ public class TCopyrightNoticeItemProvider extends ItemProviderAdapter implements
     }
 
     /**
-     * This returns TCopyrightNotice.gif.
+     * This returns CopyrightNotice.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TCopyrightNotice" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/CopyrightNotice" ) );
     }
 
     /**
@@ -125,7 +125,7 @@ public class TCopyrightNoticeItemProvider extends ItemProviderAdapter implements
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TCopyrightNotice_type" );
+        return getString( "_UI_CopyrightNotice_type" );
     }
 
     /**
@@ -139,9 +139,9 @@ public class TCopyrightNoticeItemProvider extends ItemProviderAdapter implements
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TCopyrightNotice.class ) ) {
-        case NsdPackage.TCOPYRIGHT_NOTICE__NOTICE:
-        case NsdPackage.TCOPYRIGHT_NOTICE__LICENSE:
+        switch( notification.getFeatureID( CopyrightNotice.class ) ) {
+        case NsdPackage.COPYRIGHT_NOTICE__NOTICE:
+        case NsdPackage.COPYRIGHT_NOTICE__LICENSE:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -159,11 +159,11 @@ public class TCopyrightNoticeItemProvider extends ItemProviderAdapter implements
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TCOPYRIGHT_NOTICE__NOTICE,
-                NsdFactory.eINSTANCE.createTNotice() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.COPYRIGHT_NOTICE__NOTICE,
+                NsdFactory.eINSTANCE.createNotice() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TCOPYRIGHT_NOTICE__LICENSE,
-                NsdFactory.eINSTANCE.createTLicense() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.COPYRIGHT_NOTICE__LICENSE,
+                NsdFactory.eINSTANCE.createLicense() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TBasicTypesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CopyrightedItemProvider.java
similarity index 88%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TBasicTypesItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CopyrightedItemProvider.java
index 568221931aadf6f05fdecef67e81974ddbd473d6..7692d91c5070744660176d66da6d11ae7ed72b88 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TBasicTypesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CopyrightedItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TBasicTypesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class CopyrightedItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TBasicTypesItemProvider extends ItemProviderAdapter implements IEdi
      * <!-- end-user-doc -->
      * @generated
      */
-    public TBasicTypesItemProvider( AdapterFactory adapterFactory ) {
+    public CopyrightedItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,7 +87,7 @@ public class TBasicTypesItemProvider extends ItemProviderAdapter implements IEdi
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TBASIC_TYPES__BASIC_TYPE );
+            childrenFeatures.add( NsdPackage.Literals.COPYRIGHTED__COPYRIGHT );
         }
         return childrenFeatures;
     }
@@ -106,14 +106,14 @@ public class TBasicTypesItemProvider extends ItemProviderAdapter implements IEdi
     }
 
     /**
-     * This returns TBasicTypes.gif.
+     * This returns Copyrighted.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TBasicTypes" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Copyrighted" ) );
     }
 
     /**
@@ -124,7 +124,7 @@ public class TBasicTypesItemProvider extends ItemProviderAdapter implements IEdi
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TBasicTypes_type" );
+        return getString( "_UI_Copyrighted_type" );
     }
 
     /**
@@ -138,8 +138,8 @@ public class TBasicTypesItemProvider extends ItemProviderAdapter implements IEdi
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TBasicTypes.class ) ) {
-        case NsdPackage.TBASIC_TYPES__BASIC_TYPE:
+        switch( notification.getFeatureID( Copyrighted.class ) ) {
+        case NsdPackage.COPYRIGHTED__COPYRIGHT:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -157,8 +157,8 @@ public class TBasicTypesItemProvider extends ItemProviderAdapter implements IEdi
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TBASIC_TYPES__BASIC_TYPE,
-                NsdFactory.eINSTANCE.createTBasicType() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.COPYRIGHTED__COPYRIGHT,
+                NsdFactory.eINSTANCE.createCopyrightNotice() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDataAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataAttributeItemProvider.java
similarity index 67%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDataAttributeItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataAttributeItemProvider.java
index a65e1a2a6e483c49d3c23b9e3f3bb58033f098a3..fb01a3a3e945ce7c2650a0c12d15eee901ca9f23 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDataAttributeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataAttributeItemProvider.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
+public class DataAttributeItemProvider extends DocumentedClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TDataAttributeItemProvider( AdapterFactory adapterFactory ) {
+    public DataAttributeItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -91,10 +91,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addDchgPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_dchg_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_dchg_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__DCHG, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_dchg_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_dchg_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__DCHG, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -107,10 +107,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addDefaultValuePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_defaultValue_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_defaultValue_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__DEFAULT_VALUE, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_defaultValue_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_defaultValue_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__DEFAULT_VALUE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -123,10 +123,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addDupdPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_dupd_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_dupd_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__DUPD, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_dupd_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_dupd_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__DUPD, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -139,10 +139,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addFcPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_fc_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_fc_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__FC, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_fc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_fc_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__FC, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -155,10 +155,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addIsArrayPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_isArray_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_isArray_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__IS_ARRAY, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_isArray_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_isArray_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__IS_ARRAY, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -171,10 +171,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addMaxIndexAttributePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_maxIndexAttribute_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_maxIndexAttribute_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_maxIndexAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_maxIndexAttribute_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -187,10 +187,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addMaxValuePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_maxValue_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_maxValue_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__MAX_VALUE, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_maxValue_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_maxValue_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__MAX_VALUE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -203,10 +203,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addMinIndexPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_minIndex_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_minIndex_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__MIN_INDEX, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_minIndex_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_minIndex_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__MIN_INDEX, true, false, false,
                         ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
     }
 
@@ -219,10 +219,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addMinValuePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_minValue_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_minValue_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__MIN_VALUE, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_minValue_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_minValue_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__MIN_VALUE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -235,10 +235,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_name_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_name_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -251,10 +251,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addPresCondPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_presCond_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_presCond_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__PRES_COND, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_presCond_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_presCond_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__PRES_COND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -267,10 +267,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addPresCondArgsPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_presCondArgs_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_presCondArgs_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__PRES_COND_ARGS, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_presCondArgs_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_presCondArgs_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__PRES_COND_ARGS, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -283,10 +283,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addPresCondArgsIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_presCondArgsID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_presCondArgsID_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__PRES_COND_ARGS_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_presCondArgsID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_presCondArgsID_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__PRES_COND_ARGS_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -299,10 +299,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addQchgPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_qchg_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_qchg_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__QCHG, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_qchg_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_qchg_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__QCHG, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -315,10 +315,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addSizeAttributePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_sizeAttribute_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_sizeAttribute_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__SIZE_ATTRIBUTE, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_sizeAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_sizeAttribute_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__SIZE_ATTRIBUTE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -331,10 +331,10 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addTypePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_type_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_type_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__TYPE, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_type_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__TYPE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -347,22 +347,22 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     protected void addTypeKindPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataAttribute_typeKind_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataAttribute_typeKind_feature",
-                                "_UI_TDataAttribute_type" ),
-                        NsdPackage.Literals.TDATA_ATTRIBUTE__TYPE_KIND, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataAttribute_typeKind_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_typeKind_feature",
+                                "_UI_DataAttribute_type" ),
+                        NsdPackage.Literals.DATA_ATTRIBUTE__TYPE_KIND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TDataAttribute.gif.
+     * This returns DataAttribute.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TDataAttribute" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DataAttribute" ) );
     }
 
     /**
@@ -373,9 +373,9 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TDataAttribute ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TDataAttribute_type" )
-                : getString( "_UI_TDataAttribute_type" ) + " " + label;
+        String label = ( ( DataAttribute ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_DataAttribute_type" )
+                : getString( "_UI_DataAttribute_type" ) + " " + label;
     }
 
     /**
@@ -389,24 +389,24 @@ public class TDataAttributeItemProvider extends TDocumentedClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TDataAttribute.class ) ) {
-        case NsdPackage.TDATA_ATTRIBUTE__DCHG:
-        case NsdPackage.TDATA_ATTRIBUTE__DEFAULT_VALUE:
-        case NsdPackage.TDATA_ATTRIBUTE__DUPD:
-        case NsdPackage.TDATA_ATTRIBUTE__FC:
-        case NsdPackage.TDATA_ATTRIBUTE__IS_ARRAY:
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_VALUE:
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_INDEX:
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_VALUE:
-        case NsdPackage.TDATA_ATTRIBUTE__NAME:
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND:
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS:
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS_ID:
-        case NsdPackage.TDATA_ATTRIBUTE__QCHG:
-        case NsdPackage.TDATA_ATTRIBUTE__SIZE_ATTRIBUTE:
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE:
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE_KIND:
+        switch( notification.getFeatureID( DataAttribute.class ) ) {
+        case NsdPackage.DATA_ATTRIBUTE__DCHG:
+        case NsdPackage.DATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__DUPD:
+        case NsdPackage.DATA_ATTRIBUTE__FC:
+        case NsdPackage.DATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__NAME:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_ATTRIBUTE__QCHG:
+        case NsdPackage.DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE_KIND:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDataObjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataObjectItemProvider.java
similarity index 69%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDataObjectItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataObjectItemProvider.java
index 138e490ea90c713cc60e96343b5aa24011bf8ac8..9a98262a06ade5c0563517b8a9379cf72cf81b6f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDataObjectItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataObjectItemProvider.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
+public class DataObjectItemProvider extends DocumentedClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TDataObjectItemProvider( AdapterFactory adapterFactory ) {
+    public DataObjectItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -85,10 +85,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addDsPresCondPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_dsPresCond_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_dsPresCond_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__DS_PRES_COND, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_dsPresCond_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_dsPresCond_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__DS_PRES_COND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -101,10 +101,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addDsPresCondArgsPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_dsPresCondArgs_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_dsPresCondArgs_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__DS_PRES_COND_ARGS, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_dsPresCondArgs_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_dsPresCondArgs_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__DS_PRES_COND_ARGS, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -117,10 +117,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addDsPresCondArgsIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_dsPresCondArgsID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_dsPresCondArgsID_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__DS_PRES_COND_ARGS_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_dsPresCondArgsID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_dsPresCondArgsID_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__DS_PRES_COND_ARGS_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -133,10 +133,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_name_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_name_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -149,10 +149,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addPresCondPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_presCond_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_presCond_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__PRES_COND, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_presCond_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_presCond_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__PRES_COND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -165,10 +165,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addPresCondArgsPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_presCondArgs_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_presCondArgs_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__PRES_COND_ARGS, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_presCondArgs_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_presCondArgs_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__PRES_COND_ARGS, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -181,10 +181,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addPresCondArgsIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_presCondArgsID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_presCondArgsID_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__PRES_COND_ARGS_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_presCondArgsID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_presCondArgsID_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__PRES_COND_ARGS_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -197,10 +197,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addTransientPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_transient_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_transient_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__TRANSIENT, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_transient_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_transient_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__TRANSIENT, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -213,10 +213,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addTypePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_type_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_type_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__TYPE, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_type_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__TYPE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -229,10 +229,10 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addUnderlyingTypePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_underlyingType_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_underlyingType_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__UNDERLYING_TYPE, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_underlyingType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_underlyingType_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__UNDERLYING_TYPE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -245,22 +245,22 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addUnderlyingTypeKindPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataObject_underlyingTypeKind_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataObject_underlyingTypeKind_feature",
-                                "_UI_TDataObject_type" ),
-                        NsdPackage.Literals.TDATA_OBJECT__UNDERLYING_TYPE_KIND, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataObject_underlyingTypeKind_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_underlyingTypeKind_feature",
+                                "_UI_DataObject_type" ),
+                        NsdPackage.Literals.DATA_OBJECT__UNDERLYING_TYPE_KIND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TDataObject.gif.
+     * This returns DataObject.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TDataObject" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DataObject" ) );
     }
 
     /**
@@ -271,9 +271,9 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TDataObject ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TDataObject_type" )
-                : getString( "_UI_TDataObject_type" ) + " " + label;
+        String label = ( ( DataObject ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_DataObject_type" )
+                : getString( "_UI_DataObject_type" ) + " " + label;
     }
 
     /**
@@ -287,18 +287,18 @@ public class TDataObjectItemProvider extends TDocumentedClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TDataObject.class ) ) {
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND:
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS:
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS_ID:
-        case NsdPackage.TDATA_OBJECT__NAME:
-        case NsdPackage.TDATA_OBJECT__PRES_COND:
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS:
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS_ID:
-        case NsdPackage.TDATA_OBJECT__TRANSIENT:
-        case NsdPackage.TDATA_OBJECT__TYPE:
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE:
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE_KIND:
+        switch( notification.getFeatureID( DataObject.class ) ) {
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__NAME:
+        case NsdPackage.DATA_OBJECT__PRES_COND:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__TRANSIENT:
+        case NsdPackage.DATA_OBJECT__TYPE:
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE_KIND:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDataSetMemberOfItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataSetMemberOfItemProvider.java
similarity index 82%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDataSetMemberOfItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataSetMemberOfItemProvider.java
index 383414adcee9f22484beb5f40aefa63870fb9acd..3c749873a33db9287c0d46dce48129c7f37bee6c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDataSetMemberOfItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataSetMemberOfItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TDataSetMemberOfItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class DataSetMemberOfItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TDataSetMemberOfItemProvider extends ItemProviderAdapter implements
      * <!-- end-user-doc -->
      * @generated
      */
-    public TDataSetMemberOfItemProvider( AdapterFactory adapterFactory ) {
+    public DataSetMemberOfItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -85,22 +85,22 @@ public class TDataSetMemberOfItemProvider extends ItemProviderAdapter implements
     protected void addCbPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDataSetMemberOf_cb_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDataSetMemberOf_cb_feature",
-                                "_UI_TDataSetMemberOf_type" ),
-                        NsdPackage.Literals.TDATA_SET_MEMBER_OF__CB, true, false, false,
+                        getResourceLocator(), getString( "_UI_DataSetMemberOf_cb_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataSetMemberOf_cb_feature",
+                                "_UI_DataSetMemberOf_type" ),
+                        NsdPackage.Literals.DATA_SET_MEMBER_OF__CB, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TDataSetMemberOf.gif.
+     * This returns DataSetMemberOf.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TDataSetMemberOf" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DataSetMemberOf" ) );
     }
 
     /**
@@ -111,10 +111,10 @@ public class TDataSetMemberOfItemProvider extends ItemProviderAdapter implements
      */
     @Override
     public String getText( Object object ) {
-        TCBKind labelValue = ( ( TDataSetMemberOf ) object ).getCb();
+        CBKind labelValue = ( ( DataSetMemberOf ) object ).getCb();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString( "_UI_TDataSetMemberOf_type" )
-                : getString( "_UI_TDataSetMemberOf_type" ) + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_DataSetMemberOf_type" )
+                : getString( "_UI_DataSetMemberOf_type" ) + " " + label;
     }
 
     /**
@@ -128,8 +128,8 @@ public class TDataSetMemberOfItemProvider extends ItemProviderAdapter implements
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TDataSetMemberOf.class ) ) {
-        case NsdPackage.TDATA_SET_MEMBER_OF__CB:
+        switch( notification.getFeatureID( DataSetMemberOf.class ) ) {
+        case NsdPackage.DATA_SET_MEMBER_OF__CB:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DependsOnTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DependsOnTypeItemProvider.java
index 59137e2776bf4b9f40d3b0e63c0619c38bececa1..508a9d2be37df20c78061de108c7d5b46231e9db 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DependsOnTypeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DependsOnTypeItemProvider.java
@@ -27,18 +27,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
@@ -47,8 +38,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * <!-- end-user-doc -->
  * @generated
  */
-public class DependsOnTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DependsOnTypeItemProvider extends NSDObjectWithVersionAndReleaseItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
@@ -72,9 +62,7 @@ public class DependsOnTypeItemProvider extends ItemProviderAdapter implements IE
 
             addIdPropertyDescriptor( object );
             addPublicationStagePropertyDescriptor( object );
-            addReleasePropertyDescriptor( object );
             addRevisionPropertyDescriptor( object );
-            addVersionPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -111,22 +99,6 @@ public class DependsOnTypeItemProvider extends ItemProviderAdapter implements IE
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
-    /**
-     * This adds a property descriptor for the Release feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addReleasePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_DependsOnType_release_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_DependsOnType_release_feature",
-                                "_UI_DependsOnType_type" ),
-                        NsdPackage.Literals.DEPENDS_ON_TYPE__RELEASE, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
-    }
-
     /**
      * This adds a property descriptor for the Revision feature.
      * <!-- begin-user-doc -->
@@ -143,22 +115,6 @@ public class DependsOnTypeItemProvider extends ItemProviderAdapter implements IE
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
-    /**
-     * This adds a property descriptor for the Version feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addVersionPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_DependsOnType_version_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_DependsOnType_version_feature",
-                                "_UI_DependsOnType_type" ),
-                        NsdPackage.Literals.DEPENDS_ON_TYPE__VERSION, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
-    }
-
     /**
      * This returns DependsOnType.gif.
      * <!-- begin-user-doc -->
@@ -197,9 +153,7 @@ public class DependsOnTypeItemProvider extends ItemProviderAdapter implements IE
         switch( notification.getFeatureID( DependsOnType.class ) ) {
         case NsdPackage.DEPENDS_ON_TYPE__ID:
         case NsdPackage.DEPENDS_ON_TYPE__PUBLICATION_STAGE:
-        case NsdPackage.DEPENDS_ON_TYPE__RELEASE:
         case NsdPackage.DEPENDS_ON_TYPE__REVISION:
-        case NsdPackage.DEPENDS_ON_TYPE__VERSION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
@@ -218,15 +172,4 @@ public class DependsOnTypeItemProvider extends ItemProviderAdapter implements IE
         super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
-    /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return NSDEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDocItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocItemProvider.java
similarity index 86%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDocItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocItemProvider.java
index e97ddd71274d32ee5d4d58a7ffcbf0f3c213b5d6..8f6b1743eb389abf6396f3c63be5cd52263ad079 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDocItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc;
 
 import java.util.Collection;
 import java.util.List;
@@ -51,12 +51,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TDocItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class DocItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -64,7 +64,7 @@ public class TDocItemProvider extends ItemProviderAdapter implements IEditingDom
      * <!-- end-user-doc -->
      * @generated
      */
-    public TDocItemProvider( AdapterFactory adapterFactory ) {
+    public DocItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -93,9 +93,9 @@ public class TDocItemProvider extends ItemProviderAdapter implements IEditingDom
     protected void addIdPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDoc_id_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDoc_id_feature", "_UI_TDoc_type" ),
-                        NsdPackage.Literals.TDOC__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getResourceLocator(), getString( "_UI_Doc_id_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Doc_id_feature", "_UI_Doc_type" ),
+                        NsdPackage.Literals.DOC__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
                         null, null ) );
     }
 
@@ -111,7 +111,7 @@ public class TDocItemProvider extends ItemProviderAdapter implements IEditingDom
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TDOC__MIXED );
+            childrenFeatures.add( NsdPackage.Literals.DOC__MIXED );
         }
         return childrenFeatures;
     }
@@ -130,14 +130,14 @@ public class TDocItemProvider extends ItemProviderAdapter implements IEditingDom
     }
 
     /**
-     * This returns TDoc.gif.
+     * This returns Doc.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TDoc" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Doc" ) );
     }
 
     /**
@@ -148,9 +148,9 @@ public class TDocItemProvider extends ItemProviderAdapter implements IEditingDom
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TDoc ) object ).getId();
-        return label == null || label.length() == 0 ? getString( "_UI_TDoc_type" )
-                : getString( "_UI_TDoc_type" ) + " " + label;
+        String label = ( ( Doc ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_Doc_type" )
+                : getString( "_UI_Doc_type" ) + " " + label;
     }
 
     /**
@@ -164,11 +164,11 @@ public class TDocItemProvider extends ItemProviderAdapter implements IEditingDom
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TDoc.class ) ) {
-        case NsdPackage.TDOC__ID:
+        switch( notification.getFeatureID( Doc.class ) ) {
+        case NsdPackage.DOC__ID:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TDOC__MIXED:
+        case NsdPackage.DOC__MIXED:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -186,34 +186,34 @@ public class TDocItemProvider extends ItemProviderAdapter implements IEditingDom
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TDOC__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, "" ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TDOC__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, "" ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TDOC__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
                         XMLTypeFactory.eINSTANCE.createProcessingInstruction() ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TDOC__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, "" ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TDOC__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED,
                 FeatureMapUtil.createEntry( NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS,
-                        NsdFactory.eINSTANCE.createTApplicableServiceNS() ) ) );
+                        NsdFactory.eINSTANCE.createApplicableServiceNS() ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TDOC__MIXED, FeatureMapUtil.createEntry(
-                NsdPackage.Literals.DOCUMENT_ROOT__COPYRIGHT, NsdFactory.eINSTANCE.createTCopyrightNotice() ) ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, FeatureMapUtil.createEntry(
+                NsdPackage.Literals.DOCUMENT_ROOT__COPYRIGHT, NsdFactory.eINSTANCE.createCopyrightNotice() ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TDOC__MIXED, FeatureMapUtil
-                .createEntry( NsdPackage.Literals.DOCUMENT_ROOT__NS, NsdFactory.eINSTANCE.createTNS() ) ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, FeatureMapUtil
+                .createEntry( NsdPackage.Literals.DOCUMENT_ROOT__NS, NsdFactory.eINSTANCE.createNS() ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TDOC__MIXED, FeatureMapUtil
-                .createEntry( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, NsdFactory.eINSTANCE.createTNSDoc() ) ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, FeatureMapUtil
+                .createEntry( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, NsdFactory.eINSTANCE.createNSDoc() ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TDOC__MIXED, FeatureMapUtil.createEntry(
-                NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS, NsdFactory.eINSTANCE.createTServiceNS() ) ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, FeatureMapUtil.createEntry(
+                NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS, NsdFactory.eINSTANCE.createServiceNS() ) ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentRootItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentRootItemProvider.java
index f480cd84982ae39a362255acd8af85659a49f640..f7c48b2dd9f00d5461277704085f802b7bbcebf1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentRootItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentRootItemProvider.java
@@ -166,19 +166,19 @@ public class DocumentRootItemProvider extends ItemProviderAdapter implements IEd
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
         newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS,
-                NsdFactory.eINSTANCE.createTApplicableServiceNS() ) );
+                NsdFactory.eINSTANCE.createApplicableServiceNS() ) );
 
         newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__COPYRIGHT,
-                NsdFactory.eINSTANCE.createTCopyrightNotice() ) );
+                NsdFactory.eINSTANCE.createCopyrightNotice() ) );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__NS, NsdFactory.eINSTANCE.createTNS() ) );
+                .add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__NS, NsdFactory.eINSTANCE.createNS() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC,
-                NsdFactory.eINSTANCE.createTNSDoc() ) );
+        newChildDescriptors.add(
+                createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, NsdFactory.eINSTANCE.createNSDoc() ) );
 
         newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS,
-                NsdFactory.eINSTANCE.createTServiceNS() ) );
+                NsdFactory.eINSTANCE.createServiceNS() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDocumentedClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentedClassItemProvider.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDocumentedClassItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentedClassItemProvider.java
index 914eb0ed78198b7cbb203fd780a0c3bfb2bfb3bc..3d93a263a39318a13a87ba6265138ecb0102775a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TDocumentedClassItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentedClassItemProvider.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass;
 
 import java.util.Collection;
 import java.util.List;
@@ -42,12 +42,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TDocumentedClassItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class DocumentedClassItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -55,7 +55,7 @@ public class TDocumentedClassItemProvider extends ItemProviderAdapter implements
      * <!-- end-user-doc -->
      * @generated
      */
-    public TDocumentedClassItemProvider( AdapterFactory adapterFactory ) {
+    public DocumentedClassItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -86,10 +86,10 @@ public class TDocumentedClassItemProvider extends ItemProviderAdapter implements
     protected void addDeprecatedPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDocumentedClass_deprecated_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDocumentedClass_deprecated_feature",
-                                "_UI_TDocumentedClass_type" ),
-                        NsdPackage.Literals.TDOCUMENTED_CLASS__DEPRECATED, true, false, false,
+                        getResourceLocator(), getString( "_UI_DocumentedClass_deprecated_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DocumentedClass_deprecated_feature",
+                                "_UI_DocumentedClass_type" ),
+                        NsdPackage.Literals.DOCUMENTED_CLASS__DEPRECATED, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -102,10 +102,10 @@ public class TDocumentedClassItemProvider extends ItemProviderAdapter implements
     protected void addDescIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDocumentedClass_descID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDocumentedClass_descID_feature",
-                                "_UI_TDocumentedClass_type" ),
-                        NsdPackage.Literals.TDOCUMENTED_CLASS__DESC_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_DocumentedClass_descID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DocumentedClass_descID_feature",
+                                "_UI_DocumentedClass_type" ),
+                        NsdPackage.Literals.DOCUMENTED_CLASS__DESC_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -118,22 +118,22 @@ public class TDocumentedClassItemProvider extends ItemProviderAdapter implements
     protected void addInformativePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TDocumentedClass_informative_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TDocumentedClass_informative_feature",
-                                "_UI_TDocumentedClass_type" ),
-                        NsdPackage.Literals.TDOCUMENTED_CLASS__INFORMATIVE, true, false, false,
+                        getResourceLocator(), getString( "_UI_DocumentedClass_informative_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DocumentedClass_informative_feature",
+                                "_UI_DocumentedClass_type" ),
+                        NsdPackage.Literals.DOCUMENTED_CLASS__INFORMATIVE, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TDocumentedClass.gif.
+     * This returns DocumentedClass.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TDocumentedClass" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DocumentedClass" ) );
     }
 
     /**
@@ -144,8 +144,8 @@ public class TDocumentedClassItemProvider extends ItemProviderAdapter implements
      */
     @Override
     public String getText( Object object ) {
-        TDocumentedClass tDocumentedClass = ( TDocumentedClass ) object;
-        return getString( "_UI_TDocumentedClass_type" ) + " " + tDocumentedClass.isDeprecated();
+        DocumentedClass documentedClass = ( DocumentedClass ) object;
+        return getString( "_UI_DocumentedClass_type" ) + " " + documentedClass.isDeprecated();
     }
 
     /**
@@ -159,10 +159,10 @@ public class TDocumentedClassItemProvider extends ItemProviderAdapter implements
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TDocumentedClass.class ) ) {
-        case NsdPackage.TDOCUMENTED_CLASS__DEPRECATED:
-        case NsdPackage.TDOCUMENTED_CLASS__DESC_ID:
-        case NsdPackage.TDOCUMENTED_CLASS__INFORMATIVE:
+        switch( notification.getFeatureID( DocumentedClass.class ) ) {
+        case NsdPackage.DOCUMENTED_CLASS__DEPRECATED:
+        case NsdPackage.DOCUMENTED_CLASS__DESC_ID:
+        case NsdPackage.DOCUMENTED_CLASS__INFORMATIVE:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TEnumerationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationItemProvider.java
similarity index 80%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TEnumerationItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationItemProvider.java
index 9141ef3a25fb53ce33cd3a50ff222204536ad3e4..bae04746446dfb2b1b333fbd5e9e225e2994623b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TEnumerationItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,19 +37,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TEnumerationItemProvider extends TTitledClassItemProvider {
+public class EnumerationItemProvider extends TitledClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TEnumerationItemProvider( AdapterFactory adapterFactory ) {
+    public EnumerationItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -79,10 +79,10 @@ public class TEnumerationItemProvider extends TTitledClassItemProvider {
     protected void addInheritedFromPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TEnumeration_inheritedFrom_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TEnumeration_inheritedFrom_feature",
-                                "_UI_TEnumeration_type" ),
-                        NsdPackage.Literals.TENUMERATION__INHERITED_FROM, true, false, false,
+                        getResourceLocator(), getString( "_UI_Enumeration_inheritedFrom_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Enumeration_inheritedFrom_feature",
+                                "_UI_Enumeration_type" ),
+                        NsdPackage.Literals.ENUMERATION__INHERITED_FROM, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -95,10 +95,10 @@ public class TEnumerationItemProvider extends TTitledClassItemProvider {
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TEnumeration_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TEnumeration_name_feature",
-                                "_UI_TEnumeration_type" ),
-                        NsdPackage.Literals.TENUMERATION__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_Enumeration_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Enumeration_name_feature",
+                                "_UI_Enumeration_type" ),
+                        NsdPackage.Literals.ENUMERATION__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -114,7 +114,7 @@ public class TEnumerationItemProvider extends TTitledClassItemProvider {
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TENUMERATION__LITERAL );
+            childrenFeatures.add( NsdPackage.Literals.ENUMERATION__LITERAL );
         }
         return childrenFeatures;
     }
@@ -133,14 +133,14 @@ public class TEnumerationItemProvider extends TTitledClassItemProvider {
     }
 
     /**
-     * This returns TEnumeration.gif.
+     * This returns Enumeration.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TEnumeration" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Enumeration" ) );
     }
 
     /**
@@ -151,9 +151,9 @@ public class TEnumerationItemProvider extends TTitledClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TEnumeration ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TEnumeration_type" )
-                : getString( "_UI_TEnumeration_type" ) + " " + label;
+        String label = ( ( Enumeration ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Enumeration_type" )
+                : getString( "_UI_Enumeration_type" ) + " " + label;
     }
 
     /**
@@ -167,12 +167,12 @@ public class TEnumerationItemProvider extends TTitledClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TEnumeration.class ) ) {
-        case NsdPackage.TENUMERATION__INHERITED_FROM:
-        case NsdPackage.TENUMERATION__NAME:
+        switch( notification.getFeatureID( Enumeration.class ) ) {
+        case NsdPackage.ENUMERATION__INHERITED_FROM:
+        case NsdPackage.ENUMERATION__NAME:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TENUMERATION__LITERAL:
+        case NsdPackage.ENUMERATION__LITERAL:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -190,8 +190,8 @@ public class TEnumerationItemProvider extends TTitledClassItemProvider {
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TENUMERATION__LITERAL,
-                NsdFactory.eINSTANCE.createTLiteral() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.ENUMERATION__LITERAL,
+                NsdFactory.eINSTANCE.createLiteral() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCopyrightedItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationsItemProvider.java
similarity index 88%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCopyrightedItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationsItemProvider.java
index da7fe44a0793952ea3b4fef2081c5b297010e63e..5ede24e666a880928cf0ec5cbf3eada6210b756b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TCopyrightedItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationsItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TCopyrightedItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class EnumerationsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TCopyrightedItemProvider extends ItemProviderAdapter implements IEd
      * <!-- end-user-doc -->
      * @generated
      */
-    public TCopyrightedItemProvider( AdapterFactory adapterFactory ) {
+    public EnumerationsItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,7 +87,7 @@ public class TCopyrightedItemProvider extends ItemProviderAdapter implements IEd
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TCOPYRIGHTED__COPYRIGHT );
+            childrenFeatures.add( NsdPackage.Literals.ENUMERATIONS__ENUMERATION );
         }
         return childrenFeatures;
     }
@@ -106,14 +106,14 @@ public class TCopyrightedItemProvider extends ItemProviderAdapter implements IEd
     }
 
     /**
-     * This returns TCopyrighted.gif.
+     * This returns Enumerations.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TCopyrighted" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Enumerations" ) );
     }
 
     /**
@@ -124,7 +124,7 @@ public class TCopyrightedItemProvider extends ItemProviderAdapter implements IEd
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TCopyrighted_type" );
+        return getString( "_UI_Enumerations_type" );
     }
 
     /**
@@ -138,8 +138,8 @@ public class TCopyrightedItemProvider extends ItemProviderAdapter implements IEd
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TCopyrighted.class ) ) {
-        case NsdPackage.TCOPYRIGHTED__COPYRIGHT:
+        switch( notification.getFeatureID( Enumerations.class ) ) {
+        case NsdPackage.ENUMERATIONS__ENUMERATION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -157,8 +157,8 @@ public class TCopyrightedItemProvider extends ItemProviderAdapter implements IEd
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TCOPYRIGHTED__COPYRIGHT,
-                NsdFactory.eINSTANCE.createTCopyrightNotice() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.ENUMERATIONS__ENUMERATION,
+                NsdFactory.eINSTANCE.createEnumeration() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TFunctionalConstraintItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintItemProvider.java
similarity index 74%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TFunctionalConstraintItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintItemProvider.java
index f6616dd9e843b5965b0fc0e4988d366800f16df0..525d51de1e934994ac2a8ede5d09ddaa74c55a65 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TFunctionalConstraintItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint;
 
 import java.util.Collection;
 import java.util.List;
@@ -45,12 +45,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TFunctionalConstraintItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class FunctionalConstraintItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -58,7 +58,7 @@ public class TFunctionalConstraintItemProvider extends ItemProviderAdapter imple
      * <!-- end-user-doc -->
      * @generated
      */
-    public TFunctionalConstraintItemProvider( AdapterFactory adapterFactory ) {
+    public FunctionalConstraintItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -89,10 +89,10 @@ public class TFunctionalConstraintItemProvider extends ItemProviderAdapter imple
     protected void addAbbreviationPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TFunctionalConstraint_abbreviation_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TFunctionalConstraint_abbreviation_feature",
-                        "_UI_TFunctionalConstraint_type" ),
-                NsdPackage.Literals.TFUNCTIONAL_CONSTRAINT__ABBREVIATION, true, false, false,
+                getString( "_UI_FunctionalConstraint_abbreviation_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_FunctionalConstraint_abbreviation_feature",
+                        "_UI_FunctionalConstraint_type" ),
+                NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__ABBREVIATION, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -105,10 +105,10 @@ public class TFunctionalConstraintItemProvider extends ItemProviderAdapter imple
     protected void addDescIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TFunctionalConstraint_descID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TFunctionalConstraint_descID_feature",
-                                "_UI_TFunctionalConstraint_type" ),
-                        NsdPackage.Literals.TFUNCTIONAL_CONSTRAINT__DESC_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_FunctionalConstraint_descID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FunctionalConstraint_descID_feature",
+                                "_UI_FunctionalConstraint_type" ),
+                        NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__DESC_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -119,13 +119,13 @@ public class TFunctionalConstraintItemProvider extends ItemProviderAdapter imple
      * @generated
      */
     protected void addTitleIDPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add( createItemPropertyDescriptor(
-                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TFunctionalConstraint_titleID_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TFunctionalConstraint_titleID_feature",
-                        "_UI_TFunctionalConstraint_type" ),
-                NsdPackage.Literals.TFUNCTIONAL_CONSTRAINT__TITLE_ID, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_FunctionalConstraint_titleID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FunctionalConstraint_titleID_feature",
+                                "_UI_FunctionalConstraint_type" ),
+                        NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__TITLE_ID, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -140,7 +140,7 @@ public class TFunctionalConstraintItemProvider extends ItemProviderAdapter imple
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES );
+            childrenFeatures.add( NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES );
         }
         return childrenFeatures;
     }
@@ -159,14 +159,14 @@ public class TFunctionalConstraintItemProvider extends ItemProviderAdapter imple
     }
 
     /**
-     * This returns TFunctionalConstraint.gif.
+     * This returns FunctionalConstraint.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TFunctionalConstraint" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/FunctionalConstraint" ) );
     }
 
     /**
@@ -177,9 +177,9 @@ public class TFunctionalConstraintItemProvider extends ItemProviderAdapter imple
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TFunctionalConstraint ) object ).getAbbreviation();
-        return label == null || label.length() == 0 ? getString( "_UI_TFunctionalConstraint_type" )
-                : getString( "_UI_TFunctionalConstraint_type" ) + " " + label;
+        String label = ( ( FunctionalConstraint ) object ).getAbbreviation();
+        return label == null || label.length() == 0 ? getString( "_UI_FunctionalConstraint_type" )
+                : getString( "_UI_FunctionalConstraint_type" ) + " " + label;
     }
 
     /**
@@ -193,13 +193,13 @@ public class TFunctionalConstraintItemProvider extends ItemProviderAdapter imple
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TFunctionalConstraint.class ) ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__ABBREVIATION:
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__DESC_ID:
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__TITLE_ID:
+        switch( notification.getFeatureID( FunctionalConstraint.class ) ) {
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__ABBREVIATION:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -217,8 +217,8 @@ public class TFunctionalConstraintItemProvider extends ItemProviderAdapter imple
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES,
-                NsdFactory.eINSTANCE.createTApplicableServices() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES,
+                NsdFactory.eINSTANCE.createApplicableServices() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TFunctionalConstraintsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintsItemProvider.java
similarity index 85%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TFunctionalConstraintsItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintsItemProvider.java
index c186cffbeccc832bfb70285bec24749591afb482..2cf59b7dc74437d516a59495a9ee473a6d6dda28 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TFunctionalConstraintsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintsItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TFunctionalConstraintsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class FunctionalConstraintsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TFunctionalConstraintsItemProvider extends ItemProviderAdapter impl
      * <!-- end-user-doc -->
      * @generated
      */
-    public TFunctionalConstraintsItemProvider( AdapterFactory adapterFactory ) {
+    public FunctionalConstraintsItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,7 +87,7 @@ public class TFunctionalConstraintsItemProvider extends ItemProviderAdapter impl
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT );
+            childrenFeatures.add( NsdPackage.Literals.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT );
         }
         return childrenFeatures;
     }
@@ -106,14 +106,14 @@ public class TFunctionalConstraintsItemProvider extends ItemProviderAdapter impl
     }
 
     /**
-     * This returns TFunctionalConstraints.gif.
+     * This returns FunctionalConstraints.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TFunctionalConstraints" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/FunctionalConstraints" ) );
     }
 
     /**
@@ -124,7 +124,7 @@ public class TFunctionalConstraintsItemProvider extends ItemProviderAdapter impl
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TFunctionalConstraints_type" );
+        return getString( "_UI_FunctionalConstraints_type" );
     }
 
     /**
@@ -138,8 +138,8 @@ public class TFunctionalConstraintsItemProvider extends ItemProviderAdapter impl
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TFunctionalConstraints.class ) ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
+        switch( notification.getFeatureID( FunctionalConstraints.class ) ) {
+        case NsdPackage.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -158,8 +158,8 @@ public class TFunctionalConstraintsItemProvider extends ItemProviderAdapter impl
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT,
-                        NsdFactory.eINSTANCE.createTFunctionalConstraint() ) );
+                .add( createChildParameter( NsdPackage.Literals.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT,
+                        NsdFactory.eINSTANCE.createFunctionalConstraint() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLNClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassItemProvider.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLNClassItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassItemProvider.java
index d2eca39c8aa6d56b204e29c1e6e220993ec2e506..0c07a0b26c5dec34d18b7fdbecbcf3bb2cbac292 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLNClassItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassItemProvider.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TLNClassItemProvider extends TAnyLNClassItemProvider {
+public class LNClassItemProvider extends AnyLNClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TLNClassItemProvider( AdapterFactory adapterFactory ) {
+    public LNClassItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -77,10 +77,10 @@ public class TLNClassItemProvider extends TAnyLNClassItemProvider {
     protected void addCanHaveLOGPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TLNClass_canHaveLOG_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TLNClass_canHaveLOG_feature",
-                                "_UI_TLNClass_type" ),
-                        NsdPackage.Literals.TLN_CLASS__CAN_HAVE_LOG, true, false, false,
+                        getResourceLocator(), getString( "_UI_LNClass_canHaveLOG_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNClass_canHaveLOG_feature",
+                                "_UI_LNClass_type" ),
+                        NsdPackage.Literals.LN_CLASS__CAN_HAVE_LOG, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -93,10 +93,10 @@ public class TLNClassItemProvider extends TAnyLNClassItemProvider {
     protected void addIsExtensionPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TLNClass_isExtension_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TLNClass_isExtension_feature",
-                                "_UI_TLNClass_type" ),
-                        NsdPackage.Literals.TLN_CLASS__IS_EXTENSION, true, false, false,
+                        getResourceLocator(), getString( "_UI_LNClass_isExtension_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNClass_isExtension_feature",
+                                "_UI_LNClass_type" ),
+                        NsdPackage.Literals.LN_CLASS__IS_EXTENSION, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -109,22 +109,22 @@ public class TLNClassItemProvider extends TAnyLNClassItemProvider {
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TLNClass_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TLNClass_name_feature",
-                                "_UI_TLNClass_type" ),
-                        NsdPackage.Literals.TLN_CLASS__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_LNClass_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNClass_name_feature",
+                                "_UI_LNClass_type" ),
+                        NsdPackage.Literals.LN_CLASS__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TLNClass.gif.
+     * This returns LNClass.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TLNClass" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LNClass" ) );
     }
 
     /**
@@ -135,9 +135,9 @@ public class TLNClassItemProvider extends TAnyLNClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TLNClass ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TLNClass_type" )
-                : getString( "_UI_TLNClass_type" ) + " " + label;
+        String label = ( ( LNClass ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_LNClass_type" )
+                : getString( "_UI_LNClass_type" ) + " " + label;
     }
 
     /**
@@ -151,10 +151,10 @@ public class TLNClassItemProvider extends TAnyLNClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TLNClass.class ) ) {
-        case NsdPackage.TLN_CLASS__CAN_HAVE_LOG:
-        case NsdPackage.TLN_CLASS__IS_EXTENSION:
-        case NsdPackage.TLN_CLASS__NAME:
+        switch( notification.getFeatureID( LNClass.class ) ) {
+        case NsdPackage.LN_CLASS__CAN_HAVE_LOG:
+        case NsdPackage.LN_CLASS__IS_EXTENSION:
+        case NsdPackage.LN_CLASS__NAME:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLNClassesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassesItemProvider.java
similarity index 85%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLNClassesItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassesItemProvider.java
index 8b7e25df8739bb320d1316bc1961ca9dd70c6bca..9c3af9d02bdbfb8c90f4f047e404e541eed86753 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLNClassesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassesItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TLNClassesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class LNClassesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TLNClassesItemProvider extends ItemProviderAdapter implements IEdit
      * <!-- end-user-doc -->
      * @generated
      */
-    public TLNClassesItemProvider( AdapterFactory adapterFactory ) {
+    public LNClassesItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,8 +87,8 @@ public class TLNClassesItemProvider extends ItemProviderAdapter implements IEdit
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TLN_CLASSES__ABSTRACT_LN_CLASS );
-            childrenFeatures.add( NsdPackage.Literals.TLN_CLASSES__LN_CLASS );
+            childrenFeatures.add( NsdPackage.Literals.LN_CLASSES__ABSTRACT_LN_CLASS );
+            childrenFeatures.add( NsdPackage.Literals.LN_CLASSES__LN_CLASS );
         }
         return childrenFeatures;
     }
@@ -107,14 +107,14 @@ public class TLNClassesItemProvider extends ItemProviderAdapter implements IEdit
     }
 
     /**
-     * This returns TLNClasses.gif.
+     * This returns LNClasses.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TLNClasses" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LNClasses" ) );
     }
 
     /**
@@ -125,7 +125,7 @@ public class TLNClassesItemProvider extends ItemProviderAdapter implements IEdit
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TLNClasses_type" );
+        return getString( "_UI_LNClasses_type" );
     }
 
     /**
@@ -139,9 +139,9 @@ public class TLNClassesItemProvider extends ItemProviderAdapter implements IEdit
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TLNClasses.class ) ) {
-        case NsdPackage.TLN_CLASSES__ABSTRACT_LN_CLASS:
-        case NsdPackage.TLN_CLASSES__LN_CLASS:
+        switch( notification.getFeatureID( LNClasses.class ) ) {
+        case NsdPackage.LN_CLASSES__ABSTRACT_LN_CLASS:
+        case NsdPackage.LN_CLASSES__LN_CLASS:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -159,11 +159,11 @@ public class TLNClassesItemProvider extends ItemProviderAdapter implements IEdit
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TLN_CLASSES__ABSTRACT_LN_CLASS,
-                NsdFactory.eINSTANCE.createTAbstractLNClass() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LN_CLASSES__ABSTRACT_LN_CLASS,
+                NsdFactory.eINSTANCE.createAbstractLNClass() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TLN_CLASSES__LN_CLASS,
-                NsdFactory.eINSTANCE.createTLNClass() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LN_CLASSES__LN_CLASS,
+                NsdFactory.eINSTANCE.createLNClass() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLicenseItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LicenseItemProvider.java
similarity index 84%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLicenseItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LicenseItemProvider.java
index 4f01f5b938b4bd41719e10c5de7f0e451d3961f8..b50c0c0b1c824cde97ff390ffaab0ac8828c33ce 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLicenseItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LicenseItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.License;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind;
 
 import java.util.Collection;
 import java.util.List;
@@ -50,12 +50,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TLicenseItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class LicenseItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -63,7 +63,7 @@ public class TLicenseItemProvider extends ItemProviderAdapter implements IEditin
      * <!-- end-user-doc -->
      * @generated
      */
-    public TLicenseItemProvider( AdapterFactory adapterFactory ) {
+    public LicenseItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -93,10 +93,10 @@ public class TLicenseItemProvider extends ItemProviderAdapter implements IEditin
     protected void addKindPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TLicense_kind_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TLicense_kind_feature",
-                                "_UI_TLicense_type" ),
-                        NsdPackage.Literals.TLICENSE__KIND, true, false, false,
+                        getResourceLocator(), getString( "_UI_License_kind_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_License_kind_feature",
+                                "_UI_License_type" ),
+                        NsdPackage.Literals.LICENSE__KIND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -109,10 +109,10 @@ public class TLicenseItemProvider extends ItemProviderAdapter implements IEditin
     protected void addUriPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TLicense_uri_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TLicense_uri_feature",
-                                "_UI_TLicense_type" ),
-                        NsdPackage.Literals.TLICENSE__URI, true, false, false,
+                        getResourceLocator(), getString( "_UI_License_uri_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_License_uri_feature",
+                                "_UI_License_type" ),
+                        NsdPackage.Literals.LICENSE__URI, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -128,7 +128,7 @@ public class TLicenseItemProvider extends ItemProviderAdapter implements IEditin
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TLICENSE__MIXED );
+            childrenFeatures.add( NsdPackage.Literals.LICENSE__MIXED );
         }
         return childrenFeatures;
     }
@@ -147,14 +147,14 @@ public class TLicenseItemProvider extends ItemProviderAdapter implements IEditin
     }
 
     /**
-     * This returns TLicense.gif.
+     * This returns License.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TLicense" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/License" ) );
     }
 
     /**
@@ -165,10 +165,10 @@ public class TLicenseItemProvider extends ItemProviderAdapter implements IEditin
      */
     @Override
     public String getText( Object object ) {
-        TLicenseKind labelValue = ( ( TLicense ) object ).getKind();
+        LicenseKind labelValue = ( ( License ) object ).getKind();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString( "_UI_TLicense_type" )
-                : getString( "_UI_TLicense_type" ) + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_License_type" )
+                : getString( "_UI_License_type" ) + " " + label;
     }
 
     /**
@@ -182,12 +182,12 @@ public class TLicenseItemProvider extends ItemProviderAdapter implements IEditin
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TLicense.class ) ) {
-        case NsdPackage.TLICENSE__KIND:
-        case NsdPackage.TLICENSE__URI:
+        switch( notification.getFeatureID( License.class ) ) {
+        case NsdPackage.LICENSE__KIND:
+        case NsdPackage.LICENSE__URI:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TLICENSE__MIXED:
+        case NsdPackage.LICENSE__MIXED:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -205,17 +205,17 @@ public class TLicenseItemProvider extends ItemProviderAdapter implements IEditin
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TLICENSE__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LICENSE__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, "" ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TLICENSE__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LICENSE__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, "" ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TLICENSE__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LICENSE__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
                         XMLTypeFactory.eINSTANCE.createProcessingInstruction() ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TLICENSE__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LICENSE__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, "" ) ) );
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLiteralItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LiteralItemProvider.java
similarity index 80%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLiteralItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LiteralItemProvider.java
index 3d75e82ac3bbbbe7bd66331623278d988cce3362..d3e9fbe71a9595f121a22505c79811ff8641552b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TLiteralItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LiteralItemProvider.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TLiteralItemProvider extends TDocumentedClassItemProvider {
+public class LiteralItemProvider extends DocumentedClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TLiteralItemProvider( AdapterFactory adapterFactory ) {
+    public LiteralItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -76,10 +76,10 @@ public class TLiteralItemProvider extends TDocumentedClassItemProvider {
     protected void addLiteralValPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TLiteral_literalVal_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TLiteral_literalVal_feature",
-                                "_UI_TLiteral_type" ),
-                        NsdPackage.Literals.TLITERAL__LITERAL_VAL, true, false, false,
+                        getResourceLocator(), getString( "_UI_Literal_literalVal_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Literal_literalVal_feature",
+                                "_UI_Literal_type" ),
+                        NsdPackage.Literals.LITERAL__LITERAL_VAL, true, false, false,
                         ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
     }
 
@@ -92,22 +92,22 @@ public class TLiteralItemProvider extends TDocumentedClassItemProvider {
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TLiteral_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TLiteral_name_feature",
-                                "_UI_TLiteral_type" ),
-                        NsdPackage.Literals.TLITERAL__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_Literal_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Literal_name_feature",
+                                "_UI_Literal_type" ),
+                        NsdPackage.Literals.LITERAL__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TLiteral.gif.
+     * This returns Literal.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TLiteral" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Literal" ) );
     }
 
     /**
@@ -118,9 +118,9 @@ public class TLiteralItemProvider extends TDocumentedClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TLiteral ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TLiteral_type" )
-                : getString( "_UI_TLiteral_type" ) + " " + label;
+        String label = ( ( Literal ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Literal_type" )
+                : getString( "_UI_Literal_type" ) + " " + label;
     }
 
     /**
@@ -134,9 +134,9 @@ public class TLiteralItemProvider extends TDocumentedClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TLiteral.class ) ) {
-        case NsdPackage.TLITERAL__LITERAL_VAL:
-        case NsdPackage.TLITERAL__NAME:
+        switch( notification.getFeatureID( Literal.class ) ) {
+        case NsdPackage.LITERAL__LITERAL_VAL:
+        case NsdPackage.LITERAL__NAME:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceConstructedAttributesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDObjectWithVersionAndReleaseItemProvider.java
similarity index 59%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceConstructedAttributesItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDObjectWithVersionAndReleaseItemProvider.java
index f910c9efe2e8a0d8fd583b9b760aaba54cfee5ee..88aa73154b9d75790199f4ea46df4aa99db4265b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceConstructedAttributesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDObjectWithVersionAndReleaseItemProvider.java
@@ -19,9 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes;
 
 import java.util.Collection;
 import java.util.List;
@@ -31,24 +30,24 @@ import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.common.util.ResourceLocator;
 
-import org.eclipse.emf.ecore.EStructuralFeature;
-
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TServiceConstructedAttributesItemProvider extends ItemProviderAdapter
+public class NSDObjectWithVersionAndReleaseItemProvider extends ItemProviderAdapter
         implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
         IItemLabelProvider, IItemPropertySource {
     /**
@@ -57,7 +56,7 @@ public class TServiceConstructedAttributesItemProvider extends ItemProviderAdapt
      * <!-- end-user-doc -->
      * @generated
      */
-    public TServiceConstructedAttributesItemProvider( AdapterFactory adapterFactory ) {
+    public NSDObjectWithVersionAndReleaseItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -72,49 +71,42 @@ public class TServiceConstructedAttributesItemProvider extends ItemProviderAdapt
         if( itemPropertyDescriptors == null ) {
             super.getPropertyDescriptors( object );
 
+            addReleasePropertyDescriptor( object );
+            addVersionPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
 
     /**
-     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
-        if( childrenFeatures == null ) {
-            super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE );
-        }
-        return childrenFeatures;
-    }
-
-    /**
+     * This adds a property descriptor for the Release feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    @Override
-    protected EStructuralFeature getChildFeature( Object object, Object child ) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
-
-        return super.getChildFeature( object, child );
+    protected void addReleasePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
+                getString( "_UI_NSDObjectWithVersionAndRelease_release_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_NSDObjectWithVersionAndRelease_release_feature",
+                        "_UI_NSDObjectWithVersionAndRelease_type" ),
+                NsdPackage.Literals.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TServiceConstructedAttributes.gif.
+     * This adds a property descriptor for the Version feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    @Override
-    public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceConstructedAttributes" ) );
+    protected void addVersionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
+                getString( "_UI_NSDObjectWithVersionAndRelease_version_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_NSDObjectWithVersionAndRelease_version_feature",
+                        "_UI_NSDObjectWithVersionAndRelease_type" ),
+                NsdPackage.Literals.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -125,7 +117,10 @@ public class TServiceConstructedAttributesItemProvider extends ItemProviderAdapt
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TServiceConstructedAttributes_type" );
+        Integer labelValue = ( ( NSDObjectWithVersionAndRelease ) object ).getRelease();
+        String label = labelValue == null ? null : labelValue.toString();
+        return label == null || label.length() == 0 ? getString( "_UI_NSDObjectWithVersionAndRelease_type" )
+                : getString( "_UI_NSDObjectWithVersionAndRelease_type" ) + " " + label;
     }
 
     /**
@@ -139,9 +134,10 @@ public class TServiceConstructedAttributesItemProvider extends ItemProviderAdapt
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TServiceConstructedAttributes.class ) ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
-            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+        switch( notification.getFeatureID( NSDObjectWithVersionAndRelease.class ) ) {
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE:
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
         super.notifyChanged( notification );
@@ -157,10 +153,6 @@ public class TServiceConstructedAttributesItemProvider extends ItemProviderAdapt
     @Override
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
-
-        newChildDescriptors.add( createChildParameter(
-                NsdPackage.Literals.TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE,
-                NsdFactory.eINSTANCE.createTServiceConstructedAttribute() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TNSDocItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDocItemProvider.java
similarity index 70%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TNSDocItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDocItemProvider.java
index c45a3d731abacde347adc94e1a291c8fd0401154..39e6971c1ecf846b76de59a3723834d3759030f3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TNSDocItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDocItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,19 +37,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TNSDocItemProvider extends TCopyrightedItemProvider {
+public class NSDocItemProvider extends CopyrightedItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TNSDocItemProvider( AdapterFactory adapterFactory ) {
+    public NSDocItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -64,14 +64,14 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
         if( itemPropertyDescriptors == null ) {
             super.getPropertyDescriptors( object );
 
+            addReleasePropertyDescriptor( object );
+            addVersionPropertyDescriptor( object );
             addIdPropertyDescriptor( object );
             addLangPropertyDescriptor( object );
             addPublicationStagePropertyDescriptor( object );
-            addReleasePropertyDescriptor( object );
             addRevisionPropertyDescriptor( object );
             addUmlDatePropertyDescriptor( object );
             addUmlVersionPropertyDescriptor( object );
-            addVersionPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -85,9 +85,9 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
     protected void addIdPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNSDoc_id_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNSDoc_id_feature", "_UI_TNSDoc_type" ),
-                        NsdPackage.Literals.TNS_DOC__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getResourceLocator(), getString( "_UI_NSDoc_id_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NSDoc_id_feature", "_UI_NSDoc_type" ),
+                        NsdPackage.Literals.NS_DOC__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
                         null, null ) );
     }
 
@@ -100,9 +100,9 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
     protected void addLangPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNSDoc_lang_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNSDoc_lang_feature", "_UI_TNSDoc_type" ),
-                        NsdPackage.Literals.TNS_DOC__LANG, true, false, false,
+                        getResourceLocator(), getString( "_UI_NSDoc_lang_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NSDoc_lang_feature", "_UI_NSDoc_type" ),
+                        NsdPackage.Literals.NS_DOC__LANG, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -115,10 +115,10 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
     protected void addPublicationStagePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNSDoc_publicationStage_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNSDoc_publicationStage_feature",
-                                "_UI_TNSDoc_type" ),
-                        NsdPackage.Literals.TNS_DOC__PUBLICATION_STAGE, true, false, false,
+                        getResourceLocator(), getString( "_UI_NSDoc_publicationStage_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NSDoc_publicationStage_feature",
+                                "_UI_NSDoc_type" ),
+                        NsdPackage.Literals.NS_DOC__PUBLICATION_STAGE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -129,13 +129,13 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
      * @generated
      */
     protected void addReleasePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNSDoc_release_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNSDoc_release_feature",
-                                "_UI_TNSDoc_type" ),
-                        NsdPackage.Literals.TNS_DOC__RELEASE, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
+                getString( "_UI_NSDObjectWithVersionAndRelease_release_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_NSDObjectWithVersionAndRelease_release_feature",
+                        "_UI_NSDObjectWithVersionAndRelease_type" ),
+                NsdPackage.Literals.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -147,10 +147,10 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
     protected void addRevisionPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNSDoc_revision_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNSDoc_revision_feature",
-                                "_UI_TNSDoc_type" ),
-                        NsdPackage.Literals.TNS_DOC__REVISION, true, false, false,
+                        getResourceLocator(), getString( "_UI_NSDoc_revision_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NSDoc_revision_feature",
+                                "_UI_NSDoc_type" ),
+                        NsdPackage.Literals.NS_DOC__REVISION, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -163,10 +163,10 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
     protected void addUmlDatePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNSDoc_umlDate_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNSDoc_umlDate_feature",
-                                "_UI_TNSDoc_type" ),
-                        NsdPackage.Literals.TNS_DOC__UML_DATE, true, false, false,
+                        getResourceLocator(), getString( "_UI_NSDoc_umlDate_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NSDoc_umlDate_feature",
+                                "_UI_NSDoc_type" ),
+                        NsdPackage.Literals.NS_DOC__UML_DATE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -179,10 +179,10 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
     protected void addUmlVersionPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNSDoc_umlVersion_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNSDoc_umlVersion_feature",
-                                "_UI_TNSDoc_type" ),
-                        NsdPackage.Literals.TNS_DOC__UML_VERSION, true, false, false,
+                        getResourceLocator(), getString( "_UI_NSDoc_umlVersion_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NSDoc_umlVersion_feature",
+                                "_UI_NSDoc_type" ),
+                        NsdPackage.Literals.NS_DOC__UML_VERSION, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -193,13 +193,13 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
      * @generated
      */
     protected void addVersionPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNSDoc_version_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNSDoc_version_feature",
-                                "_UI_TNSDoc_type" ),
-                        NsdPackage.Literals.TNS_DOC__VERSION, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
+                getString( "_UI_NSDObjectWithVersionAndRelease_version_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_NSDObjectWithVersionAndRelease_version_feature",
+                        "_UI_NSDObjectWithVersionAndRelease_type" ),
+                NsdPackage.Literals.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -214,7 +214,7 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TNS_DOC__DOC );
+            childrenFeatures.add( NsdPackage.Literals.NS_DOC__DOC );
         }
         return childrenFeatures;
     }
@@ -233,14 +233,14 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
     }
 
     /**
-     * This returns TNSDoc.gif.
+     * This returns NSDoc.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TNSDoc" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/NSDoc" ) );
     }
 
     /**
@@ -251,9 +251,9 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TNSDoc ) object ).getId();
-        return label == null || label.length() == 0 ? getString( "_UI_TNSDoc_type" )
-                : getString( "_UI_TNSDoc_type" ) + " " + label;
+        String label = ( ( NSDoc ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_NSDoc_type" )
+                : getString( "_UI_NSDoc_type" ) + " " + label;
     }
 
     /**
@@ -267,18 +267,18 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TNSDoc.class ) ) {
-        case NsdPackage.TNS_DOC__ID:
-        case NsdPackage.TNS_DOC__LANG:
-        case NsdPackage.TNS_DOC__PUBLICATION_STAGE:
-        case NsdPackage.TNS_DOC__RELEASE:
-        case NsdPackage.TNS_DOC__REVISION:
-        case NsdPackage.TNS_DOC__UML_DATE:
-        case NsdPackage.TNS_DOC__UML_VERSION:
-        case NsdPackage.TNS_DOC__VERSION:
+        switch( notification.getFeatureID( NSDoc.class ) ) {
+        case NsdPackage.NS_DOC__RELEASE:
+        case NsdPackage.NS_DOC__VERSION:
+        case NsdPackage.NS_DOC__ID:
+        case NsdPackage.NS_DOC__LANG:
+        case NsdPackage.NS_DOC__PUBLICATION_STAGE:
+        case NsdPackage.NS_DOC__REVISION:
+        case NsdPackage.NS_DOC__UML_DATE:
+        case NsdPackage.NS_DOC__UML_VERSION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TNS_DOC__DOC:
+        case NsdPackage.NS_DOC__DOC:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -297,7 +297,7 @@ public class TNSDocItemProvider extends TCopyrightedItemProvider {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.TNS_DOC__DOC, NsdFactory.eINSTANCE.createTDoc() ) );
+                .add( createChildParameter( NsdPackage.Literals.NS_DOC__DOC, NsdFactory.eINSTANCE.createDoc() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TNSItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSItemProvider.java
similarity index 62%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TNSItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSItemProvider.java
index 1690f583be47926739fe80003afce659e9d728fb..11059ca5b79369e7c611440aad9f5de355db06b1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TNSItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,19 +37,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TNSItemProvider extends TCopyrightedItemProvider {
+public class NSItemProvider extends CopyrightedItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TNSItemProvider( AdapterFactory adapterFactory ) {
+    public NSItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -64,14 +64,14 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
         if( itemPropertyDescriptors == null ) {
             super.getPropertyDescriptors( object );
 
+            addReleasePropertyDescriptor( object );
+            addVersionPropertyDescriptor( object );
             addDescIDPropertyDescriptor( object );
             addIdPropertyDescriptor( object );
             addPublicationStagePropertyDescriptor( object );
-            addReleasePropertyDescriptor( object );
             addRevisionPropertyDescriptor( object );
             addUmlDatePropertyDescriptor( object );
             addUmlVersionPropertyDescriptor( object );
-            addVersionPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -85,10 +85,10 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
     protected void addDescIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNS_descID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNS_descID_feature", "_UI_TNS_type" ),
-                        NsdPackage.Literals.TNS__DESC_ID, true, false, false,
-                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+                        getResourceLocator(), getString( "_UI_NS_descID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NS_descID_feature", "_UI_NS_type" ),
+                        NsdPackage.Literals.NS__DESC_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null, null ) );
     }
 
     /**
@@ -100,9 +100,9 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
     protected void addIdPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNS_id_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNS_id_feature", "_UI_TNS_type" ),
-                        NsdPackage.Literals.TNS__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getResourceLocator(), getString( "_UI_NS_id_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NS_id_feature", "_UI_NS_type" ),
+                        NsdPackage.Literals.NS__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
                         null, null ) );
     }
 
@@ -115,10 +115,10 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
     protected void addPublicationStagePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNS_publicationStage_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNS_publicationStage_feature",
-                                "_UI_TNS_type" ),
-                        NsdPackage.Literals.TNS__PUBLICATION_STAGE, true, false, false,
+                        getResourceLocator(), getString( "_UI_NS_publicationStage_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NS_publicationStage_feature",
+                                "_UI_NS_type" ),
+                        NsdPackage.Literals.NS__PUBLICATION_STAGE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -129,12 +129,13 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
      * @generated
      */
     protected void addReleasePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNS_release_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNS_release_feature", "_UI_TNS_type" ),
-                        NsdPackage.Literals.TNS__RELEASE, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
+                getString( "_UI_NSDObjectWithVersionAndRelease_release_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_NSDObjectWithVersionAndRelease_release_feature",
+                        "_UI_NSDObjectWithVersionAndRelease_type" ),
+                NsdPackage.Literals.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -146,9 +147,9 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
     protected void addRevisionPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNS_revision_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNS_revision_feature", "_UI_TNS_type" ),
-                        NsdPackage.Literals.TNS__REVISION, true, false, false,
+                        getResourceLocator(), getString( "_UI_NS_revision_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NS_revision_feature", "_UI_NS_type" ),
+                        NsdPackage.Literals.NS__REVISION, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -161,9 +162,9 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
     protected void addUmlDatePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNS_umlDate_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNS_umlDate_feature", "_UI_TNS_type" ),
-                        NsdPackage.Literals.TNS__UML_DATE, true, false, false,
+                        getResourceLocator(), getString( "_UI_NS_umlDate_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NS_umlDate_feature", "_UI_NS_type" ),
+                        NsdPackage.Literals.NS__UML_DATE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -176,9 +177,9 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
     protected void addUmlVersionPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNS_umlVersion_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNS_umlVersion_feature", "_UI_TNS_type" ),
-                        NsdPackage.Literals.TNS__UML_VERSION, true, false, false,
+                        getResourceLocator(), getString( "_UI_NS_umlVersion_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_NS_umlVersion_feature", "_UI_NS_type" ),
+                        NsdPackage.Literals.NS__UML_VERSION, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -189,12 +190,13 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
      * @generated
      */
     protected void addVersionPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TNS_version_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TNS_version_feature", "_UI_TNS_type" ),
-                        NsdPackage.Literals.TNS__VERSION, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
+                getString( "_UI_NSDObjectWithVersionAndRelease_version_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_NSDObjectWithVersionAndRelease_version_feature",
+                        "_UI_NSDObjectWithVersionAndRelease_type" ),
+                NsdPackage.Literals.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -209,16 +211,16 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TNS__CHANGES );
-            childrenFeatures.add( NsdPackage.Literals.TNS__DEPENDS_ON );
-            childrenFeatures.add( NsdPackage.Literals.TNS__BASIC_TYPES );
-            childrenFeatures.add( NsdPackage.Literals.TNS__FUNCTIONAL_CONSTRAINTS );
-            childrenFeatures.add( NsdPackage.Literals.TNS__PRESENCE_CONDITIONS );
-            childrenFeatures.add( NsdPackage.Literals.TNS__ABBREVIATIONS );
-            childrenFeatures.add( NsdPackage.Literals.TNS__ENUMERATIONS );
-            childrenFeatures.add( NsdPackage.Literals.TNS__CONSTRUCTED_ATTRIBUTES );
-            childrenFeatures.add( NsdPackage.Literals.TNS__CD_CS );
-            childrenFeatures.add( NsdPackage.Literals.TNS__LN_CLASSES );
+            childrenFeatures.add( NsdPackage.Literals.NS__CHANGES );
+            childrenFeatures.add( NsdPackage.Literals.NS__DEPENDS_ON );
+            childrenFeatures.add( NsdPackage.Literals.NS__BASIC_TYPES );
+            childrenFeatures.add( NsdPackage.Literals.NS__FUNCTIONAL_CONSTRAINTS );
+            childrenFeatures.add( NsdPackage.Literals.NS__PRESENCE_CONDITIONS );
+            childrenFeatures.add( NsdPackage.Literals.NS__ABBREVIATIONS );
+            childrenFeatures.add( NsdPackage.Literals.NS__ENUMERATIONS );
+            childrenFeatures.add( NsdPackage.Literals.NS__CONSTRUCTED_ATTRIBUTES );
+            childrenFeatures.add( NsdPackage.Literals.NS__CD_CS );
+            childrenFeatures.add( NsdPackage.Literals.NS__LN_CLASSES );
         }
         return childrenFeatures;
     }
@@ -237,14 +239,14 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
     }
 
     /**
-     * This returns TNS.gif.
+     * This returns NS.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TNS" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/NS" ) );
     }
 
     /**
@@ -255,9 +257,9 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TNS ) object ).getId();
-        return label == null || label.length() == 0 ? getString( "_UI_TNS_type" )
-                : getString( "_UI_TNS_type" ) + " " + label;
+        String label = ( ( NS ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_NS_type" )
+                : getString( "_UI_NS_type" ) + " " + label;
     }
 
     /**
@@ -271,27 +273,27 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TNS.class ) ) {
-        case NsdPackage.TNS__DESC_ID:
-        case NsdPackage.TNS__ID:
-        case NsdPackage.TNS__PUBLICATION_STAGE:
-        case NsdPackage.TNS__RELEASE:
-        case NsdPackage.TNS__REVISION:
-        case NsdPackage.TNS__UML_DATE:
-        case NsdPackage.TNS__UML_VERSION:
-        case NsdPackage.TNS__VERSION:
+        switch( notification.getFeatureID( NS.class ) ) {
+        case NsdPackage.NS__RELEASE:
+        case NsdPackage.NS__VERSION:
+        case NsdPackage.NS__DESC_ID:
+        case NsdPackage.NS__ID:
+        case NsdPackage.NS__PUBLICATION_STAGE:
+        case NsdPackage.NS__REVISION:
+        case NsdPackage.NS__UML_DATE:
+        case NsdPackage.NS__UML_VERSION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TNS__CHANGES:
-        case NsdPackage.TNS__DEPENDS_ON:
-        case NsdPackage.TNS__BASIC_TYPES:
-        case NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS:
-        case NsdPackage.TNS__PRESENCE_CONDITIONS:
-        case NsdPackage.TNS__ABBREVIATIONS:
-        case NsdPackage.TNS__ENUMERATIONS:
-        case NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES:
-        case NsdPackage.TNS__CD_CS:
-        case NsdPackage.TNS__LN_CLASSES:
+        case NsdPackage.NS__CHANGES:
+        case NsdPackage.NS__DEPENDS_ON:
+        case NsdPackage.NS__BASIC_TYPES:
+        case NsdPackage.NS__FUNCTIONAL_CONSTRAINTS:
+        case NsdPackage.NS__PRESENCE_CONDITIONS:
+        case NsdPackage.NS__ABBREVIATIONS:
+        case NsdPackage.NS__ENUMERATIONS:
+        case NsdPackage.NS__CONSTRUCTED_ATTRIBUTES:
+        case NsdPackage.NS__CD_CS:
+        case NsdPackage.NS__LN_CLASSES:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -310,34 +312,34 @@ public class TNSItemProvider extends TCopyrightedItemProvider {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.TNS__CHANGES, NsdFactory.eINSTANCE.createTChanges() ) );
+                .add( createChildParameter( NsdPackage.Literals.NS__CHANGES, NsdFactory.eINSTANCE.createChanges() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNS__DEPENDS_ON,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__DEPENDS_ON,
                 NsdFactory.eINSTANCE.createDependsOnType() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNS__BASIC_TYPES,
-                NsdFactory.eINSTANCE.createTBasicTypes() ) );
+        newChildDescriptors.add(
+                createChildParameter( NsdPackage.Literals.NS__BASIC_TYPES, NsdFactory.eINSTANCE.createBasicTypes() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNS__FUNCTIONAL_CONSTRAINTS,
-                NsdFactory.eINSTANCE.createTFunctionalConstraints() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__FUNCTIONAL_CONSTRAINTS,
+                NsdFactory.eINSTANCE.createFunctionalConstraints() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNS__PRESENCE_CONDITIONS,
-                NsdFactory.eINSTANCE.createTPresenceConditions() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__PRESENCE_CONDITIONS,
+                NsdFactory.eINSTANCE.createPresenceConditions() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNS__ABBREVIATIONS,
-                NsdFactory.eINSTANCE.createTAbbreviations() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__ABBREVIATIONS,
+                NsdFactory.eINSTANCE.createAbbreviations() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNS__ENUMERATIONS,
-                NsdFactory.eINSTANCE.createTEnumerations() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__ENUMERATIONS,
+                NsdFactory.eINSTANCE.createEnumerations() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNS__CONSTRUCTED_ATTRIBUTES,
-                NsdFactory.eINSTANCE.createTConstructedAttributes() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__CONSTRUCTED_ATTRIBUTES,
+                NsdFactory.eINSTANCE.createConstructedAttributes() ) );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.TNS__CD_CS, NsdFactory.eINSTANCE.createTCDCs() ) );
+                .add( createChildParameter( NsdPackage.Literals.NS__CD_CS, NsdFactory.eINSTANCE.createCDCs() ) );
 
         newChildDescriptors.add(
-                createChildParameter( NsdPackage.Literals.TNS__LN_CLASSES, NsdFactory.eINSTANCE.createTLNClasses() ) );
+                createChildParameter( NsdPackage.Literals.NS__LN_CLASSES, NsdFactory.eINSTANCE.createLNClasses() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TNoticeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NoticeItemProvider.java
similarity index 90%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TNoticeItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NoticeItemProvider.java
index 6b26e6dcc8f1c62c61f9899547de994be47717c1..baf336b0948fc0190143984a26e0b1911b9eb1c2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TNoticeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NoticeItemProvider.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice;
 
 import java.util.Collection;
 import java.util.List;
@@ -47,12 +47,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TNoticeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class NoticeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -60,7 +60,7 @@ public class TNoticeItemProvider extends ItemProviderAdapter implements IEditing
      * <!-- end-user-doc -->
      * @generated
      */
-    public TNoticeItemProvider( AdapterFactory adapterFactory ) {
+    public NoticeItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -91,7 +91,7 @@ public class TNoticeItemProvider extends ItemProviderAdapter implements IEditing
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TNOTICE__MIXED );
+            childrenFeatures.add( NsdPackage.Literals.NOTICE__MIXED );
         }
         return childrenFeatures;
     }
@@ -110,14 +110,14 @@ public class TNoticeItemProvider extends ItemProviderAdapter implements IEditing
     }
 
     /**
-     * This returns TNotice.gif.
+     * This returns Notice.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TNotice" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Notice" ) );
     }
 
     /**
@@ -128,7 +128,7 @@ public class TNoticeItemProvider extends ItemProviderAdapter implements IEditing
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TNotice_type" );
+        return getString( "_UI_Notice_type" );
     }
 
     /**
@@ -142,8 +142,8 @@ public class TNoticeItemProvider extends ItemProviderAdapter implements IEditing
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TNotice.class ) ) {
-        case NsdPackage.TNOTICE__MIXED:
+        switch( notification.getFeatureID( Notice.class ) ) {
+        case NsdPackage.NOTICE__MIXED:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -161,17 +161,17 @@ public class TNoticeItemProvider extends ItemProviderAdapter implements IEditing
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNOTICE__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NOTICE__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, "" ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNOTICE__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NOTICE__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, "" ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNOTICE__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NOTICE__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
                         XMLTypeFactory.eINSTANCE.createProcessingInstruction() ) ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TNOTICE__MIXED,
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NOTICE__MIXED,
                 FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, "" ) ) );
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdItemProviderAdapterFactory.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdItemProviderAdapterFactory.java
index 992462c21fec5884812d027204a3ab1285c95966..90ece9ee86dd2fb73fea98bc61e62251b89a9215 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdItemProviderAdapterFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdItemProviderAdapterFactory.java
@@ -182,1038 +182,1038 @@ public class NsdItemProviderAdapterFactory extends NsdAdapterFactory
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TAbbreviationItemProvider tAbbreviationItemProvider;
+    protected AbbreviationItemProvider abbreviationItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTAbbreviationAdapter() {
-        if( tAbbreviationItemProvider == null ) {
-            tAbbreviationItemProvider = new TAbbreviationItemProvider( this );
+    public Adapter createAbbreviationAdapter() {
+        if( abbreviationItemProvider == null ) {
+            abbreviationItemProvider = new AbbreviationItemProvider( this );
         }
 
-        return tAbbreviationItemProvider;
+        return abbreviationItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TAbbreviationsItemProvider tAbbreviationsItemProvider;
+    protected AbbreviationsItemProvider abbreviationsItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTAbbreviationsAdapter() {
-        if( tAbbreviationsItemProvider == null ) {
-            tAbbreviationsItemProvider = new TAbbreviationsItemProvider( this );
+    public Adapter createAbbreviationsAdapter() {
+        if( abbreviationsItemProvider == null ) {
+            abbreviationsItemProvider = new AbbreviationsItemProvider( this );
         }
 
-        return tAbbreviationsItemProvider;
+        return abbreviationsItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TAbstractLNClassItemProvider tAbstractLNClassItemProvider;
+    protected AbstractLNClassItemProvider abstractLNClassItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTAbstractLNClassAdapter() {
-        if( tAbstractLNClassItemProvider == null ) {
-            tAbstractLNClassItemProvider = new TAbstractLNClassItemProvider( this );
+    public Adapter createAbstractLNClassAdapter() {
+        if( abstractLNClassItemProvider == null ) {
+            abstractLNClassItemProvider = new AbstractLNClassItemProvider( this );
         }
 
-        return tAbstractLNClassItemProvider;
+        return abstractLNClassItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TApplicableServiceNSItemProvider tApplicableServiceNSItemProvider;
+    protected ApplicableServiceNSItemProvider applicableServiceNSItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTApplicableServiceNSAdapter() {
-        if( tApplicableServiceNSItemProvider == null ) {
-            tApplicableServiceNSItemProvider = new TApplicableServiceNSItemProvider( this );
+    public Adapter createApplicableServiceNSAdapter() {
+        if( applicableServiceNSItemProvider == null ) {
+            applicableServiceNSItemProvider = new ApplicableServiceNSItemProvider( this );
         }
 
-        return tApplicableServiceNSItemProvider;
+        return applicableServiceNSItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TApplicableServicesItemProvider tApplicableServicesItemProvider;
+    protected ApplicableServicesItemProvider applicableServicesItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTApplicableServicesAdapter() {
-        if( tApplicableServicesItemProvider == null ) {
-            tApplicableServicesItemProvider = new TApplicableServicesItemProvider( this );
+    public Adapter createApplicableServicesAdapter() {
+        if( applicableServicesItemProvider == null ) {
+            applicableServicesItemProvider = new ApplicableServicesItemProvider( this );
         }
 
-        return tApplicableServicesItemProvider;
+        return applicableServicesItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TBasicTypeItemProvider tBasicTypeItemProvider;
+    protected BasicTypeItemProvider basicTypeItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTBasicTypeAdapter() {
-        if( tBasicTypeItemProvider == null ) {
-            tBasicTypeItemProvider = new TBasicTypeItemProvider( this );
+    public Adapter createBasicTypeAdapter() {
+        if( basicTypeItemProvider == null ) {
+            basicTypeItemProvider = new BasicTypeItemProvider( this );
         }
 
-        return tBasicTypeItemProvider;
+        return basicTypeItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TBasicTypesItemProvider tBasicTypesItemProvider;
+    protected BasicTypesItemProvider basicTypesItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTBasicTypesAdapter() {
-        if( tBasicTypesItemProvider == null ) {
-            tBasicTypesItemProvider = new TBasicTypesItemProvider( this );
+    public Adapter createBasicTypesAdapter() {
+        if( basicTypesItemProvider == null ) {
+            basicTypesItemProvider = new BasicTypesItemProvider( this );
         }
 
-        return tBasicTypesItemProvider;
+        return basicTypesItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TCDCItemProvider tcdcItemProvider;
+    protected CDCItemProvider cdcItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTCDCAdapter() {
-        if( tcdcItemProvider == null ) {
-            tcdcItemProvider = new TCDCItemProvider( this );
+    public Adapter createCDCAdapter() {
+        if( cdcItemProvider == null ) {
+            cdcItemProvider = new CDCItemProvider( this );
         }
 
-        return tcdcItemProvider;
+        return cdcItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TCDCsItemProvider tcdCsItemProvider;
+    protected CDCsItemProvider cdCsItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTCDCsAdapter() {
-        if( tcdCsItemProvider == null ) {
-            tcdCsItemProvider = new TCDCsItemProvider( this );
+    public Adapter createCDCsAdapter() {
+        if( cdCsItemProvider == null ) {
+            cdCsItemProvider = new CDCsItemProvider( this );
         }
 
-        return tcdCsItemProvider;
+        return cdCsItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TChangesItemProvider tChangesItemProvider;
+    protected ChangesItemProvider changesItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTChangesAdapter() {
-        if( tChangesItemProvider == null ) {
-            tChangesItemProvider = new TChangesItemProvider( this );
+    public Adapter createChangesAdapter() {
+        if( changesItemProvider == null ) {
+            changesItemProvider = new ChangesItemProvider( this );
         }
 
-        return tChangesItemProvider;
+        return changesItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TConstructedAttributeItemProvider tConstructedAttributeItemProvider;
+    protected ConstructedAttributeItemProvider constructedAttributeItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTConstructedAttributeAdapter() {
-        if( tConstructedAttributeItemProvider == null ) {
-            tConstructedAttributeItemProvider = new TConstructedAttributeItemProvider( this );
+    public Adapter createConstructedAttributeAdapter() {
+        if( constructedAttributeItemProvider == null ) {
+            constructedAttributeItemProvider = new ConstructedAttributeItemProvider( this );
         }
 
-        return tConstructedAttributeItemProvider;
+        return constructedAttributeItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TConstructedAttributesItemProvider tConstructedAttributesItemProvider;
+    protected ConstructedAttributesItemProvider constructedAttributesItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTConstructedAttributesAdapter() {
-        if( tConstructedAttributesItemProvider == null ) {
-            tConstructedAttributesItemProvider = new TConstructedAttributesItemProvider( this );
+    public Adapter createConstructedAttributesAdapter() {
+        if( constructedAttributesItemProvider == null ) {
+            constructedAttributesItemProvider = new ConstructedAttributesItemProvider( this );
         }
 
-        return tConstructedAttributesItemProvider;
+        return constructedAttributesItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TCopyrightedItemProvider tCopyrightedItemProvider;
+    protected CopyrightedItemProvider copyrightedItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTCopyrightedAdapter() {
-        if( tCopyrightedItemProvider == null ) {
-            tCopyrightedItemProvider = new TCopyrightedItemProvider( this );
+    public Adapter createCopyrightedAdapter() {
+        if( copyrightedItemProvider == null ) {
+            copyrightedItemProvider = new CopyrightedItemProvider( this );
         }
 
-        return tCopyrightedItemProvider;
+        return copyrightedItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TCopyrightNoticeItemProvider tCopyrightNoticeItemProvider;
+    protected CopyrightNoticeItemProvider copyrightNoticeItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTCopyrightNoticeAdapter() {
-        if( tCopyrightNoticeItemProvider == null ) {
-            tCopyrightNoticeItemProvider = new TCopyrightNoticeItemProvider( this );
+    public Adapter createCopyrightNoticeAdapter() {
+        if( copyrightNoticeItemProvider == null ) {
+            copyrightNoticeItemProvider = new CopyrightNoticeItemProvider( this );
         }
 
-        return tCopyrightNoticeItemProvider;
+        return copyrightNoticeItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDataAttributeItemProvider tDataAttributeItemProvider;
+    protected DataAttributeItemProvider dataAttributeItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTDataAttributeAdapter() {
-        if( tDataAttributeItemProvider == null ) {
-            tDataAttributeItemProvider = new TDataAttributeItemProvider( this );
+    public Adapter createDataAttributeAdapter() {
+        if( dataAttributeItemProvider == null ) {
+            dataAttributeItemProvider = new DataAttributeItemProvider( this );
         }
 
-        return tDataAttributeItemProvider;
+        return dataAttributeItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDataObjectItemProvider tDataObjectItemProvider;
+    protected DataObjectItemProvider dataObjectItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTDataObjectAdapter() {
-        if( tDataObjectItemProvider == null ) {
-            tDataObjectItemProvider = new TDataObjectItemProvider( this );
+    public Adapter createDataObjectAdapter() {
+        if( dataObjectItemProvider == null ) {
+            dataObjectItemProvider = new DataObjectItemProvider( this );
         }
 
-        return tDataObjectItemProvider;
+        return dataObjectItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDataSetMemberOfItemProvider tDataSetMemberOfItemProvider;
+    protected DataSetMemberOfItemProvider dataSetMemberOfItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTDataSetMemberOfAdapter() {
-        if( tDataSetMemberOfItemProvider == null ) {
-            tDataSetMemberOfItemProvider = new TDataSetMemberOfItemProvider( this );
+    public Adapter createDataSetMemberOfAdapter() {
+        if( dataSetMemberOfItemProvider == null ) {
+            dataSetMemberOfItemProvider = new DataSetMemberOfItemProvider( this );
         }
 
-        return tDataSetMemberOfItemProvider;
+        return dataSetMemberOfItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDocItemProvider tDocItemProvider;
+    protected DocItemProvider docItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTDocAdapter() {
-        if( tDocItemProvider == null ) {
-            tDocItemProvider = new TDocItemProvider( this );
+    public Adapter createDocAdapter() {
+        if( docItemProvider == null ) {
+            docItemProvider = new DocItemProvider( this );
         }
 
-        return tDocItemProvider;
+        return docItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDocumentedClassItemProvider tDocumentedClassItemProvider;
+    protected DocumentedClassItemProvider documentedClassItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTDocumentedClassAdapter() {
-        if( tDocumentedClassItemProvider == null ) {
-            tDocumentedClassItemProvider = new TDocumentedClassItemProvider( this );
+    public Adapter createDocumentedClassAdapter() {
+        if( documentedClassItemProvider == null ) {
+            documentedClassItemProvider = new DocumentedClassItemProvider( this );
         }
 
-        return tDocumentedClassItemProvider;
+        return documentedClassItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TEnumerationItemProvider tEnumerationItemProvider;
+    protected EnumerationItemProvider enumerationItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTEnumerationAdapter() {
-        if( tEnumerationItemProvider == null ) {
-            tEnumerationItemProvider = new TEnumerationItemProvider( this );
+    public Adapter createEnumerationAdapter() {
+        if( enumerationItemProvider == null ) {
+            enumerationItemProvider = new EnumerationItemProvider( this );
         }
 
-        return tEnumerationItemProvider;
+        return enumerationItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TEnumerationsItemProvider tEnumerationsItemProvider;
+    protected EnumerationsItemProvider enumerationsItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTEnumerationsAdapter() {
-        if( tEnumerationsItemProvider == null ) {
-            tEnumerationsItemProvider = new TEnumerationsItemProvider( this );
+    public Adapter createEnumerationsAdapter() {
+        if( enumerationsItemProvider == null ) {
+            enumerationsItemProvider = new EnumerationsItemProvider( this );
         }
 
-        return tEnumerationsItemProvider;
+        return enumerationsItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TFunctionalConstraintItemProvider tFunctionalConstraintItemProvider;
+    protected FunctionalConstraintItemProvider functionalConstraintItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTFunctionalConstraintAdapter() {
-        if( tFunctionalConstraintItemProvider == null ) {
-            tFunctionalConstraintItemProvider = new TFunctionalConstraintItemProvider( this );
+    public Adapter createFunctionalConstraintAdapter() {
+        if( functionalConstraintItemProvider == null ) {
+            functionalConstraintItemProvider = new FunctionalConstraintItemProvider( this );
         }
 
-        return tFunctionalConstraintItemProvider;
+        return functionalConstraintItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TFunctionalConstraintsItemProvider tFunctionalConstraintsItemProvider;
+    protected FunctionalConstraintsItemProvider functionalConstraintsItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTFunctionalConstraintsAdapter() {
-        if( tFunctionalConstraintsItemProvider == null ) {
-            tFunctionalConstraintsItemProvider = new TFunctionalConstraintsItemProvider( this );
+    public Adapter createFunctionalConstraintsAdapter() {
+        if( functionalConstraintsItemProvider == null ) {
+            functionalConstraintsItemProvider = new FunctionalConstraintsItemProvider( this );
         }
 
-        return tFunctionalConstraintsItemProvider;
+        return functionalConstraintsItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TLicenseItemProvider tLicenseItemProvider;
+    protected LicenseItemProvider licenseItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTLicenseAdapter() {
-        if( tLicenseItemProvider == null ) {
-            tLicenseItemProvider = new TLicenseItemProvider( this );
+    public Adapter createLicenseAdapter() {
+        if( licenseItemProvider == null ) {
+            licenseItemProvider = new LicenseItemProvider( this );
         }
 
-        return tLicenseItemProvider;
+        return licenseItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TLiteralItemProvider tLiteralItemProvider;
+    protected LiteralItemProvider literalItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTLiteralAdapter() {
-        if( tLiteralItemProvider == null ) {
-            tLiteralItemProvider = new TLiteralItemProvider( this );
+    public Adapter createLiteralAdapter() {
+        if( literalItemProvider == null ) {
+            literalItemProvider = new LiteralItemProvider( this );
         }
 
-        return tLiteralItemProvider;
+        return literalItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TLNClassItemProvider tlnClassItemProvider;
+    protected LNClassItemProvider lnClassItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTLNClassAdapter() {
-        if( tlnClassItemProvider == null ) {
-            tlnClassItemProvider = new TLNClassItemProvider( this );
+    public Adapter createLNClassAdapter() {
+        if( lnClassItemProvider == null ) {
+            lnClassItemProvider = new LNClassItemProvider( this );
         }
 
-        return tlnClassItemProvider;
+        return lnClassItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TLNClassesItemProvider tlnClassesItemProvider;
+    protected LNClassesItemProvider lnClassesItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTLNClassesAdapter() {
-        if( tlnClassesItemProvider == null ) {
-            tlnClassesItemProvider = new TLNClassesItemProvider( this );
+    public Adapter createLNClassesAdapter() {
+        if( lnClassesItemProvider == null ) {
+            lnClassesItemProvider = new LNClassesItemProvider( this );
         }
 
-        return tlnClassesItemProvider;
+        return lnClassesItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TNoticeItemProvider tNoticeItemProvider;
+    protected NoticeItemProvider noticeItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTNoticeAdapter() {
-        if( tNoticeItemProvider == null ) {
-            tNoticeItemProvider = new TNoticeItemProvider( this );
+    public Adapter createNoticeAdapter() {
+        if( noticeItemProvider == null ) {
+            noticeItemProvider = new NoticeItemProvider( this );
         }
 
-        return tNoticeItemProvider;
+        return noticeItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TNSItemProvider tnsItemProvider;
+    protected NSItemProvider nsItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTNSAdapter() {
-        if( tnsItemProvider == null ) {
-            tnsItemProvider = new TNSItemProvider( this );
+    public Adapter createNSAdapter() {
+        if( nsItemProvider == null ) {
+            nsItemProvider = new NSItemProvider( this );
         }
 
-        return tnsItemProvider;
+        return nsItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TNSDocItemProvider tnsDocItemProvider;
+    protected NSDocItemProvider nsDocItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTNSDocAdapter() {
-        if( tnsDocItemProvider == null ) {
-            tnsDocItemProvider = new TNSDocItemProvider( this );
+    public Adapter createNSDocAdapter() {
+        if( nsDocItemProvider == null ) {
+            nsDocItemProvider = new NSDocItemProvider( this );
         }
 
-        return tnsDocItemProvider;
+        return nsDocItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TPresenceConditionItemProvider tPresenceConditionItemProvider;
+    protected PresenceConditionItemProvider presenceConditionItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTPresenceConditionAdapter() {
-        if( tPresenceConditionItemProvider == null ) {
-            tPresenceConditionItemProvider = new TPresenceConditionItemProvider( this );
+    public Adapter createPresenceConditionAdapter() {
+        if( presenceConditionItemProvider == null ) {
+            presenceConditionItemProvider = new PresenceConditionItemProvider( this );
         }
 
-        return tPresenceConditionItemProvider;
+        return presenceConditionItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TPresenceConditionsItemProvider tPresenceConditionsItemProvider;
+    protected PresenceConditionsItemProvider presenceConditionsItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTPresenceConditionsAdapter() {
-        if( tPresenceConditionsItemProvider == null ) {
-            tPresenceConditionsItemProvider = new TPresenceConditionsItemProvider( this );
+    public Adapter createPresenceConditionsAdapter() {
+        if( presenceConditionsItemProvider == null ) {
+            presenceConditionsItemProvider = new PresenceConditionsItemProvider( this );
         }
 
-        return tPresenceConditionsItemProvider;
+        return presenceConditionsItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceCDCItemProvider tServiceCDCItemProvider;
+    protected ServiceCDCItemProvider serviceCDCItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceCDCAdapter() {
-        if( tServiceCDCItemProvider == null ) {
-            tServiceCDCItemProvider = new TServiceCDCItemProvider( this );
+    public Adapter createServiceCDCAdapter() {
+        if( serviceCDCItemProvider == null ) {
+            serviceCDCItemProvider = new ServiceCDCItemProvider( this );
         }
 
-        return tServiceCDCItemProvider;
+        return serviceCDCItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceCDCsItemProvider tServiceCDCsItemProvider;
+    protected ServiceCDCsItemProvider serviceCDCsItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceCDCsAdapter() {
-        if( tServiceCDCsItemProvider == null ) {
-            tServiceCDCsItemProvider = new TServiceCDCsItemProvider( this );
+    public Adapter createServiceCDCsAdapter() {
+        if( serviceCDCsItemProvider == null ) {
+            serviceCDCsItemProvider = new ServiceCDCsItemProvider( this );
         }
 
-        return tServiceCDCsItemProvider;
+        return serviceCDCsItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceConstructedAttributeItemProvider tServiceConstructedAttributeItemProvider;
+    protected ServiceConstructedAttributeItemProvider serviceConstructedAttributeItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceConstructedAttributeAdapter() {
-        if( tServiceConstructedAttributeItemProvider == null ) {
-            tServiceConstructedAttributeItemProvider = new TServiceConstructedAttributeItemProvider( this );
+    public Adapter createServiceConstructedAttributeAdapter() {
+        if( serviceConstructedAttributeItemProvider == null ) {
+            serviceConstructedAttributeItemProvider = new ServiceConstructedAttributeItemProvider( this );
         }
 
-        return tServiceConstructedAttributeItemProvider;
+        return serviceConstructedAttributeItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceConstructedAttributesItemProvider tServiceConstructedAttributesItemProvider;
+    protected ServiceConstructedAttributesItemProvider serviceConstructedAttributesItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceConstructedAttributesAdapter() {
-        if( tServiceConstructedAttributesItemProvider == null ) {
-            tServiceConstructedAttributesItemProvider = new TServiceConstructedAttributesItemProvider( this );
+    public Adapter createServiceConstructedAttributesAdapter() {
+        if( serviceConstructedAttributesItemProvider == null ) {
+            serviceConstructedAttributesItemProvider = new ServiceConstructedAttributesItemProvider( this );
         }
 
-        return tServiceConstructedAttributesItemProvider;
+        return serviceConstructedAttributesItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceDataAttributeItemProvider tServiceDataAttributeItemProvider;
+    protected ServiceDataAttributeItemProvider serviceDataAttributeItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceDataAttributeAdapter() {
-        if( tServiceDataAttributeItemProvider == null ) {
-            tServiceDataAttributeItemProvider = new TServiceDataAttributeItemProvider( this );
+    public Adapter createServiceDataAttributeAdapter() {
+        if( serviceDataAttributeItemProvider == null ) {
+            serviceDataAttributeItemProvider = new ServiceDataAttributeItemProvider( this );
         }
 
-        return tServiceDataAttributeItemProvider;
+        return serviceDataAttributeItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceNSItemProvider tServiceNSItemProvider;
+    protected ServiceNSItemProvider serviceNSItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceNSAdapter() {
-        if( tServiceNSItemProvider == null ) {
-            tServiceNSItemProvider = new TServiceNSItemProvider( this );
+    public Adapter createServiceNSAdapter() {
+        if( serviceNSItemProvider == null ) {
+            serviceNSItemProvider = new ServiceNSItemProvider( this );
         }
 
-        return tServiceNSItemProvider;
+        return serviceNSItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceNsUsageItemProvider tServiceNsUsageItemProvider;
+    protected ServiceNsUsageItemProvider serviceNsUsageItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceNsUsageAdapter() {
-        if( tServiceNsUsageItemProvider == null ) {
-            tServiceNsUsageItemProvider = new TServiceNsUsageItemProvider( this );
+    public Adapter createServiceNsUsageAdapter() {
+        if( serviceNsUsageItemProvider == null ) {
+            serviceNsUsageItemProvider = new ServiceNsUsageItemProvider( this );
         }
 
-        return tServiceNsUsageItemProvider;
+        return serviceNsUsageItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceParameterItemProvider tServiceParameterItemProvider;
+    protected ServiceParameterItemProvider serviceParameterItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceParameterAdapter() {
-        if( tServiceParameterItemProvider == null ) {
-            tServiceParameterItemProvider = new TServiceParameterItemProvider( this );
+    public Adapter createServiceParameterAdapter() {
+        if( serviceParameterItemProvider == null ) {
+            serviceParameterItemProvider = new ServiceParameterItemProvider( this );
         }
 
-        return tServiceParameterItemProvider;
+        return serviceParameterItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceTypeRealizationItemProvider tServiceTypeRealizationItemProvider;
+    protected ServiceTypeRealizationItemProvider serviceTypeRealizationItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceTypeRealizationAdapter() {
-        if( tServiceTypeRealizationItemProvider == null ) {
-            tServiceTypeRealizationItemProvider = new TServiceTypeRealizationItemProvider( this );
+    public Adapter createServiceTypeRealizationAdapter() {
+        if( serviceTypeRealizationItemProvider == null ) {
+            serviceTypeRealizationItemProvider = new ServiceTypeRealizationItemProvider( this );
         }
 
-        return tServiceTypeRealizationItemProvider;
+        return serviceTypeRealizationItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceTypeRealizationsItemProvider tServiceTypeRealizationsItemProvider;
+    protected ServiceTypeRealizationsItemProvider serviceTypeRealizationsItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTServiceTypeRealizationsAdapter() {
-        if( tServiceTypeRealizationsItemProvider == null ) {
-            tServiceTypeRealizationsItemProvider = new TServiceTypeRealizationsItemProvider( this );
+    public Adapter createServiceTypeRealizationsAdapter() {
+        if( serviceTypeRealizationsItemProvider == null ) {
+            serviceTypeRealizationsItemProvider = new ServiceTypeRealizationsItemProvider( this );
         }
 
-        return tServiceTypeRealizationsItemProvider;
+        return serviceTypeRealizationsItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TSubDataAttributeItemProvider tSubDataAttributeItemProvider;
+    protected SubDataAttributeItemProvider subDataAttributeItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTSubDataAttributeAdapter() {
-        if( tSubDataAttributeItemProvider == null ) {
-            tSubDataAttributeItemProvider = new TSubDataAttributeItemProvider( this );
+    public Adapter createSubDataAttributeAdapter() {
+        if( subDataAttributeItemProvider == null ) {
+            subDataAttributeItemProvider = new SubDataAttributeItemProvider( this );
         }
 
-        return tSubDataAttributeItemProvider;
+        return subDataAttributeItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TSubDataObjectItemProvider tSubDataObjectItemProvider;
+    protected SubDataObjectItemProvider subDataObjectItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTSubDataObjectAdapter() {
-        if( tSubDataObjectItemProvider == null ) {
-            tSubDataObjectItemProvider = new TSubDataObjectItemProvider( this );
+    public Adapter createSubDataObjectAdapter() {
+        if( subDataObjectItemProvider == null ) {
+            subDataObjectItemProvider = new SubDataObjectItemProvider( this );
         }
 
-        return tSubDataObjectItemProvider;
+        return subDataObjectItemProvider;
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass} instances.
+     * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TTitledClassItemProvider tTitledClassItemProvider;
+    protected TitledClassItemProvider titledClassItemProvider;
 
     /**
-     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass}.
+     * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTTitledClassAdapter() {
-        if( tTitledClassItemProvider == null ) {
-            tTitledClassItemProvider = new TTitledClassItemProvider( this );
+    public Adapter createTitledClassAdapter() {
+        if( titledClassItemProvider == null ) {
+            titledClassItemProvider = new TitledClassItemProvider( this );
         }
 
-        return tTitledClassItemProvider;
+        return titledClassItemProvider;
     }
 
     /**
@@ -1325,51 +1325,51 @@ public class NsdItemProviderAdapterFactory extends NsdAdapterFactory
         if( dependsOnTypeItemProvider != null ) dependsOnTypeItemProvider.dispose();
         if( documentRootItemProvider != null ) documentRootItemProvider.dispose();
         if( serviceTypeItemProvider != null ) serviceTypeItemProvider.dispose();
-        if( tAbbreviationItemProvider != null ) tAbbreviationItemProvider.dispose();
-        if( tAbbreviationsItemProvider != null ) tAbbreviationsItemProvider.dispose();
-        if( tAbstractLNClassItemProvider != null ) tAbstractLNClassItemProvider.dispose();
-        if( tApplicableServiceNSItemProvider != null ) tApplicableServiceNSItemProvider.dispose();
-        if( tApplicableServicesItemProvider != null ) tApplicableServicesItemProvider.dispose();
-        if( tBasicTypeItemProvider != null ) tBasicTypeItemProvider.dispose();
-        if( tBasicTypesItemProvider != null ) tBasicTypesItemProvider.dispose();
-        if( tcdcItemProvider != null ) tcdcItemProvider.dispose();
-        if( tcdCsItemProvider != null ) tcdCsItemProvider.dispose();
-        if( tChangesItemProvider != null ) tChangesItemProvider.dispose();
-        if( tConstructedAttributeItemProvider != null ) tConstructedAttributeItemProvider.dispose();
-        if( tConstructedAttributesItemProvider != null ) tConstructedAttributesItemProvider.dispose();
-        if( tCopyrightedItemProvider != null ) tCopyrightedItemProvider.dispose();
-        if( tCopyrightNoticeItemProvider != null ) tCopyrightNoticeItemProvider.dispose();
-        if( tDataAttributeItemProvider != null ) tDataAttributeItemProvider.dispose();
-        if( tDataObjectItemProvider != null ) tDataObjectItemProvider.dispose();
-        if( tDataSetMemberOfItemProvider != null ) tDataSetMemberOfItemProvider.dispose();
-        if( tDocItemProvider != null ) tDocItemProvider.dispose();
-        if( tDocumentedClassItemProvider != null ) tDocumentedClassItemProvider.dispose();
-        if( tEnumerationItemProvider != null ) tEnumerationItemProvider.dispose();
-        if( tEnumerationsItemProvider != null ) tEnumerationsItemProvider.dispose();
-        if( tFunctionalConstraintItemProvider != null ) tFunctionalConstraintItemProvider.dispose();
-        if( tFunctionalConstraintsItemProvider != null ) tFunctionalConstraintsItemProvider.dispose();
-        if( tLicenseItemProvider != null ) tLicenseItemProvider.dispose();
-        if( tLiteralItemProvider != null ) tLiteralItemProvider.dispose();
-        if( tlnClassItemProvider != null ) tlnClassItemProvider.dispose();
-        if( tlnClassesItemProvider != null ) tlnClassesItemProvider.dispose();
-        if( tNoticeItemProvider != null ) tNoticeItemProvider.dispose();
-        if( tnsItemProvider != null ) tnsItemProvider.dispose();
-        if( tnsDocItemProvider != null ) tnsDocItemProvider.dispose();
-        if( tPresenceConditionItemProvider != null ) tPresenceConditionItemProvider.dispose();
-        if( tPresenceConditionsItemProvider != null ) tPresenceConditionsItemProvider.dispose();
-        if( tServiceCDCItemProvider != null ) tServiceCDCItemProvider.dispose();
-        if( tServiceCDCsItemProvider != null ) tServiceCDCsItemProvider.dispose();
-        if( tServiceConstructedAttributeItemProvider != null ) tServiceConstructedAttributeItemProvider.dispose();
-        if( tServiceConstructedAttributesItemProvider != null ) tServiceConstructedAttributesItemProvider.dispose();
-        if( tServiceDataAttributeItemProvider != null ) tServiceDataAttributeItemProvider.dispose();
-        if( tServiceNSItemProvider != null ) tServiceNSItemProvider.dispose();
-        if( tServiceNsUsageItemProvider != null ) tServiceNsUsageItemProvider.dispose();
-        if( tServiceParameterItemProvider != null ) tServiceParameterItemProvider.dispose();
-        if( tServiceTypeRealizationItemProvider != null ) tServiceTypeRealizationItemProvider.dispose();
-        if( tServiceTypeRealizationsItemProvider != null ) tServiceTypeRealizationsItemProvider.dispose();
-        if( tSubDataAttributeItemProvider != null ) tSubDataAttributeItemProvider.dispose();
-        if( tSubDataObjectItemProvider != null ) tSubDataObjectItemProvider.dispose();
-        if( tTitledClassItemProvider != null ) tTitledClassItemProvider.dispose();
+        if( abbreviationItemProvider != null ) abbreviationItemProvider.dispose();
+        if( abbreviationsItemProvider != null ) abbreviationsItemProvider.dispose();
+        if( abstractLNClassItemProvider != null ) abstractLNClassItemProvider.dispose();
+        if( applicableServiceNSItemProvider != null ) applicableServiceNSItemProvider.dispose();
+        if( applicableServicesItemProvider != null ) applicableServicesItemProvider.dispose();
+        if( basicTypeItemProvider != null ) basicTypeItemProvider.dispose();
+        if( basicTypesItemProvider != null ) basicTypesItemProvider.dispose();
+        if( cdcItemProvider != null ) cdcItemProvider.dispose();
+        if( cdCsItemProvider != null ) cdCsItemProvider.dispose();
+        if( changesItemProvider != null ) changesItemProvider.dispose();
+        if( constructedAttributeItemProvider != null ) constructedAttributeItemProvider.dispose();
+        if( constructedAttributesItemProvider != null ) constructedAttributesItemProvider.dispose();
+        if( copyrightedItemProvider != null ) copyrightedItemProvider.dispose();
+        if( copyrightNoticeItemProvider != null ) copyrightNoticeItemProvider.dispose();
+        if( dataAttributeItemProvider != null ) dataAttributeItemProvider.dispose();
+        if( dataObjectItemProvider != null ) dataObjectItemProvider.dispose();
+        if( dataSetMemberOfItemProvider != null ) dataSetMemberOfItemProvider.dispose();
+        if( docItemProvider != null ) docItemProvider.dispose();
+        if( documentedClassItemProvider != null ) documentedClassItemProvider.dispose();
+        if( enumerationItemProvider != null ) enumerationItemProvider.dispose();
+        if( enumerationsItemProvider != null ) enumerationsItemProvider.dispose();
+        if( functionalConstraintItemProvider != null ) functionalConstraintItemProvider.dispose();
+        if( functionalConstraintsItemProvider != null ) functionalConstraintsItemProvider.dispose();
+        if( licenseItemProvider != null ) licenseItemProvider.dispose();
+        if( literalItemProvider != null ) literalItemProvider.dispose();
+        if( lnClassItemProvider != null ) lnClassItemProvider.dispose();
+        if( lnClassesItemProvider != null ) lnClassesItemProvider.dispose();
+        if( noticeItemProvider != null ) noticeItemProvider.dispose();
+        if( nsItemProvider != null ) nsItemProvider.dispose();
+        if( nsDocItemProvider != null ) nsDocItemProvider.dispose();
+        if( presenceConditionItemProvider != null ) presenceConditionItemProvider.dispose();
+        if( presenceConditionsItemProvider != null ) presenceConditionsItemProvider.dispose();
+        if( serviceCDCItemProvider != null ) serviceCDCItemProvider.dispose();
+        if( serviceCDCsItemProvider != null ) serviceCDCsItemProvider.dispose();
+        if( serviceConstructedAttributeItemProvider != null ) serviceConstructedAttributeItemProvider.dispose();
+        if( serviceConstructedAttributesItemProvider != null ) serviceConstructedAttributesItemProvider.dispose();
+        if( serviceDataAttributeItemProvider != null ) serviceDataAttributeItemProvider.dispose();
+        if( serviceNSItemProvider != null ) serviceNSItemProvider.dispose();
+        if( serviceNsUsageItemProvider != null ) serviceNsUsageItemProvider.dispose();
+        if( serviceParameterItemProvider != null ) serviceParameterItemProvider.dispose();
+        if( serviceTypeRealizationItemProvider != null ) serviceTypeRealizationItemProvider.dispose();
+        if( serviceTypeRealizationsItemProvider != null ) serviceTypeRealizationsItemProvider.dispose();
+        if( subDataAttributeItemProvider != null ) subDataAttributeItemProvider.dispose();
+        if( subDataObjectItemProvider != null ) subDataObjectItemProvider.dispose();
+        if( titledClassItemProvider != null ) titledClassItemProvider.dispose();
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TPresenceConditionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionItemProvider.java
similarity index 75%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TPresenceConditionItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionItemProvider.java
index 9a21749fc0cfa9b03f5771d77ae64df19e331858..5e981b783a7857c3924257b93366365686f42719 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TPresenceConditionItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionItemProvider.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
 
 import java.util.Collection;
 import java.util.List;
@@ -42,12 +42,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TPresenceConditionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class PresenceConditionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -55,7 +55,7 @@ public class TPresenceConditionItemProvider extends ItemProviderAdapter implemen
      * <!-- end-user-doc -->
      * @generated
      */
-    public TPresenceConditionItemProvider( AdapterFactory adapterFactory ) {
+    public PresenceConditionItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,10 +87,10 @@ public class TPresenceConditionItemProvider extends ItemProviderAdapter implemen
     protected void addArgumentPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TPresenceCondition_argument_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TPresenceCondition_argument_feature",
-                                "_UI_TPresenceCondition_type" ),
-                        NsdPackage.Literals.TPRESENCE_CONDITION__ARGUMENT, true, false, false,
+                        getResourceLocator(), getString( "_UI_PresenceCondition_argument_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_argument_feature",
+                                "_UI_PresenceCondition_type" ),
+                        NsdPackage.Literals.PRESENCE_CONDITION__ARGUMENT, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -103,10 +103,10 @@ public class TPresenceConditionItemProvider extends ItemProviderAdapter implemen
     protected void addDescIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TPresenceCondition_descID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TPresenceCondition_descID_feature",
-                                "_UI_TPresenceCondition_type" ),
-                        NsdPackage.Literals.TPRESENCE_CONDITION__DESC_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_PresenceCondition_descID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_descID_feature",
+                                "_UI_PresenceCondition_type" ),
+                        NsdPackage.Literals.PRESENCE_CONDITION__DESC_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -119,10 +119,10 @@ public class TPresenceConditionItemProvider extends ItemProviderAdapter implemen
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TPresenceCondition_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TPresenceCondition_name_feature",
-                                "_UI_TPresenceCondition_type" ),
-                        NsdPackage.Literals.TPRESENCE_CONDITION__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_PresenceCondition_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_name_feature",
+                                "_UI_PresenceCondition_type" ),
+                        NsdPackage.Literals.PRESENCE_CONDITION__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -135,22 +135,22 @@ public class TPresenceConditionItemProvider extends ItemProviderAdapter implemen
     protected void addTitleIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TPresenceCondition_titleID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TPresenceCondition_titleID_feature",
-                                "_UI_TPresenceCondition_type" ),
-                        NsdPackage.Literals.TPRESENCE_CONDITION__TITLE_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_PresenceCondition_titleID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_titleID_feature",
+                                "_UI_PresenceCondition_type" ),
+                        NsdPackage.Literals.PRESENCE_CONDITION__TITLE_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TPresenceCondition.gif.
+     * This returns PresenceCondition.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TPresenceCondition" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/PresenceCondition" ) );
     }
 
     /**
@@ -161,9 +161,9 @@ public class TPresenceConditionItemProvider extends ItemProviderAdapter implemen
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TPresenceCondition ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TPresenceCondition_type" )
-                : getString( "_UI_TPresenceCondition_type" ) + " " + label;
+        String label = ( ( PresenceCondition ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_PresenceCondition_type" )
+                : getString( "_UI_PresenceCondition_type" ) + " " + label;
     }
 
     /**
@@ -177,11 +177,11 @@ public class TPresenceConditionItemProvider extends ItemProviderAdapter implemen
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TPresenceCondition.class ) ) {
-        case NsdPackage.TPRESENCE_CONDITION__ARGUMENT:
-        case NsdPackage.TPRESENCE_CONDITION__DESC_ID:
-        case NsdPackage.TPRESENCE_CONDITION__NAME:
-        case NsdPackage.TPRESENCE_CONDITION__TITLE_ID:
+        switch( notification.getFeatureID( PresenceCondition.class ) ) {
+        case NsdPackage.PRESENCE_CONDITION__ARGUMENT:
+        case NsdPackage.PRESENCE_CONDITION__DESC_ID:
+        case NsdPackage.PRESENCE_CONDITION__NAME:
+        case NsdPackage.PRESENCE_CONDITION__TITLE_ID:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAbbreviationsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionsItemProvider.java
similarity index 86%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAbbreviationsItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionsItemProvider.java
index 521b4c724c4397a99a5929c2314dc94dcf967b2a..9bdb5a94749b4c89805afa6ae7cd52bf13503b19 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TAbbreviationsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionsItemProvider.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TAbbreviationsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class PresenceConditionsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TAbbreviationsItemProvider extends ItemProviderAdapter implements I
      * <!-- end-user-doc -->
      * @generated
      */
-    public TAbbreviationsItemProvider( AdapterFactory adapterFactory ) {
+    public PresenceConditionsItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,7 +87,7 @@ public class TAbbreviationsItemProvider extends ItemProviderAdapter implements I
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TABBREVIATIONS__ABBREVIATION );
+            childrenFeatures.add( NsdPackage.Literals.PRESENCE_CONDITIONS__PRESENCE_CONDITION );
         }
         return childrenFeatures;
     }
@@ -106,14 +106,14 @@ public class TAbbreviationsItemProvider extends ItemProviderAdapter implements I
     }
 
     /**
-     * This returns TAbbreviations.gif.
+     * This returns PresenceConditions.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TAbbreviations" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/PresenceConditions" ) );
     }
 
     /**
@@ -124,7 +124,7 @@ public class TAbbreviationsItemProvider extends ItemProviderAdapter implements I
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TAbbreviations_type" );
+        return getString( "_UI_PresenceConditions_type" );
     }
 
     /**
@@ -138,8 +138,8 @@ public class TAbbreviationsItemProvider extends ItemProviderAdapter implements I
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TAbbreviations.class ) ) {
-        case NsdPackage.TABBREVIATIONS__ABBREVIATION:
+        switch( notification.getFeatureID( PresenceConditions.class ) ) {
+        case NsdPackage.PRESENCE_CONDITIONS__PRESENCE_CONDITION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -157,8 +157,8 @@ public class TAbbreviationsItemProvider extends ItemProviderAdapter implements I
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TABBREVIATIONS__ABBREVIATION,
-                NsdFactory.eINSTANCE.createTAbbreviation() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.PRESENCE_CONDITIONS__PRESENCE_CONDITION,
+                NsdFactory.eINSTANCE.createPresenceCondition() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceCDCItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCItemProvider.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceCDCItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCItemProvider.java
index 9f7d394cdefb56a8587b0e99d2de520466f2b1d2..ad2af82241c86e1b631a3267697699c39ca6fdd8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceCDCItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCItemProvider.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC;
 
 import java.util.Collection;
 import java.util.List;
@@ -45,12 +45,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TServiceCDCItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class ServiceCDCItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -58,7 +58,7 @@ public class TServiceCDCItemProvider extends ItemProviderAdapter implements IEdi
      * <!-- end-user-doc -->
      * @generated
      */
-    public TServiceCDCItemProvider( AdapterFactory adapterFactory ) {
+    public ServiceCDCItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -88,10 +88,10 @@ public class TServiceCDCItemProvider extends ItemProviderAdapter implements IEdi
     protected void addCdcPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceCDC_cdc_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceCDC_cdc_feature",
-                                "_UI_TServiceCDC_type" ),
-                        NsdPackage.Literals.TSERVICE_CDC__CDC, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceCDC_cdc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceCDC_cdc_feature",
+                                "_UI_ServiceCDC_type" ),
+                        NsdPackage.Literals.SERVICE_CDC__CDC, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -104,10 +104,10 @@ public class TServiceCDCItemProvider extends ItemProviderAdapter implements IEdi
     protected void addVariantPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceCDC_variant_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceCDC_variant_feature",
-                                "_UI_TServiceCDC_type" ),
-                        NsdPackage.Literals.TSERVICE_CDC__VARIANT, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceCDC_variant_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceCDC_variant_feature",
+                                "_UI_ServiceCDC_type" ),
+                        NsdPackage.Literals.SERVICE_CDC__VARIANT, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -123,7 +123,7 @@ public class TServiceCDCItemProvider extends ItemProviderAdapter implements IEdi
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE );
         }
         return childrenFeatures;
     }
@@ -142,14 +142,14 @@ public class TServiceCDCItemProvider extends ItemProviderAdapter implements IEdi
     }
 
     /**
-     * This returns TServiceCDC.gif.
+     * This returns ServiceCDC.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceCDC" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceCDC" ) );
     }
 
     /**
@@ -160,9 +160,9 @@ public class TServiceCDCItemProvider extends ItemProviderAdapter implements IEdi
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TServiceCDC ) object ).getCdc();
-        return label == null || label.length() == 0 ? getString( "_UI_TServiceCDC_type" )
-                : getString( "_UI_TServiceCDC_type" ) + " " + label;
+        String label = ( ( ServiceCDC ) object ).getCdc();
+        return label == null || label.length() == 0 ? getString( "_UI_ServiceCDC_type" )
+                : getString( "_UI_ServiceCDC_type" ) + " " + label;
     }
 
     /**
@@ -176,12 +176,12 @@ public class TServiceCDCItemProvider extends ItemProviderAdapter implements IEdi
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TServiceCDC.class ) ) {
-        case NsdPackage.TSERVICE_CDC__CDC:
-        case NsdPackage.TSERVICE_CDC__VARIANT:
+        switch( notification.getFeatureID( ServiceCDC.class ) ) {
+        case NsdPackage.SERVICE_CDC__CDC:
+        case NsdPackage.SERVICE_CDC__VARIANT:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
+        case NsdPackage.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -199,8 +199,8 @@ public class TServiceCDCItemProvider extends ItemProviderAdapter implements IEdi
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE,
-                NsdFactory.eINSTANCE.createTServiceDataAttribute() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE,
+                NsdFactory.eINSTANCE.createServiceDataAttribute() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCsItemProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..09323db81ed8e0e2bb684c079c51db08dcf4c71c
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCsItemProvider.java
@@ -0,0 +1,175 @@
+/**
+ *  Copyright (c) 2019 CentraleSupélec & EDF.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ * 
+ */
+package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
+
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ServiceCDCsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+    /**
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public ServiceCDCsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_CD_CS__SERVICE_CDC );
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
+        // Check the type of the specified child object and return the proper feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature( object, child );
+    }
+
+    /**
+     * This returns ServiceCDCs.gif.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceCDCs" ) );
+    }
+
+    /**
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String getText( Object object ) {
+        return getString( "_UI_ServiceCDCs_type" );
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ServiceCDCs.class ) ) {
+        case NsdPackage.SERVICE_CD_CS__SERVICE_CDC:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
+        }
+        super.notifyChanged( notification );
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_CD_CS__SERVICE_CDC,
+                NsdFactory.eINSTANCE.createServiceCDC() ) );
+    }
+
+    /**
+     * Return the resource locator for this item provider's resources.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public ResourceLocator getResourceLocator() {
+        return NSDEditPlugin.INSTANCE;
+    }
+
+}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceConstructedAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributeItemProvider.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceConstructedAttributeItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributeItemProvider.java
index 61517356ca12000f6fc4771e8b7be47aa7096786..abc4c1258fa5989af8b1ac8dc06d761af89cce09 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceConstructedAttributeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributeItemProvider.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TServiceConstructedAttributeItemProvider extends TConstructedAttributeItemProvider {
+public class ServiceConstructedAttributeItemProvider extends ConstructedAttributeItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TServiceConstructedAttributeItemProvider( AdapterFactory adapterFactory ) {
+    public ServiceConstructedAttributeItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -75,23 +75,23 @@ public class TServiceConstructedAttributeItemProvider extends TConstructedAttrib
     protected void addTypeKindParameterizedPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceConstructedAttribute_typeKindParameterized_feature" ),
+                getString( "_UI_ServiceConstructedAttribute_typeKindParameterized_feature" ),
                 getString( "_UI_PropertyDescriptor_description",
-                        "_UI_TServiceConstructedAttribute_typeKindParameterized_feature",
-                        "_UI_TServiceConstructedAttribute_type" ),
-                NsdPackage.Literals.TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, true, false, false,
+                        "_UI_ServiceConstructedAttribute_typeKindParameterized_feature",
+                        "_UI_ServiceConstructedAttribute_type" ),
+                NsdPackage.Literals.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, true, false, false,
                 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TServiceConstructedAttribute.gif.
+     * This returns ServiceConstructedAttribute.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceConstructedAttribute" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceConstructedAttribute" ) );
     }
 
     /**
@@ -102,9 +102,9 @@ public class TServiceConstructedAttributeItemProvider extends TConstructedAttrib
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TServiceConstructedAttribute ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TServiceConstructedAttribute_type" )
-                : getString( "_UI_TServiceConstructedAttribute_type" ) + " " + label;
+        String label = ( ( ServiceConstructedAttribute ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_ServiceConstructedAttribute_type" )
+                : getString( "_UI_ServiceConstructedAttribute_type" ) + " " + label;
     }
 
     /**
@@ -118,8 +118,8 @@ public class TServiceConstructedAttributeItemProvider extends TConstructedAttrib
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TServiceConstructedAttribute.class ) ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
+        switch( notification.getFeatureID( ServiceConstructedAttribute.class ) ) {
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributesItemProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..9531fca3d5c86c56c111500959dab4ed8049c513
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributesItemProvider.java
@@ -0,0 +1,176 @@
+/**
+ *  Copyright (c) 2019 CentraleSupélec & EDF.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ * 
+ */
+package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
+
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ServiceConstructedAttributesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+    /**
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public ServiceConstructedAttributesItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE );
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
+        // Check the type of the specified child object and return the proper feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature( object, child );
+    }
+
+    /**
+     * This returns ServiceConstructedAttributes.gif.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceConstructedAttributes" ) );
+    }
+
+    /**
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String getText( Object object ) {
+        return getString( "_UI_ServiceConstructedAttributes_type" );
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ServiceConstructedAttributes.class ) ) {
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
+        }
+        super.notifyChanged( notification );
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add(
+                createChildParameter( NsdPackage.Literals.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE,
+                        NsdFactory.eINSTANCE.createServiceConstructedAttribute() ) );
+    }
+
+    /**
+     * Return the resource locator for this item provider's resources.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public ResourceLocator getResourceLocator() {
+        return NSDEditPlugin.INSTANCE;
+    }
+
+}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceDataAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceDataAttributeItemProvider.java
similarity index 66%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceDataAttributeItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceDataAttributeItemProvider.java
index 41c79b586ac3aff9a958728d89c2d65236bcafdf..3ac9fc650b72eff976434d790f7dc751c5e24546 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceDataAttributeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceDataAttributeItemProvider.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvider {
+public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TServiceDataAttributeItemProvider( AdapterFactory adapterFactory ) {
+    public ServiceDataAttributeItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -83,10 +83,10 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
     protected void addFcPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceDataAttribute_fc_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceDataAttribute_fc_feature",
-                                "_UI_TServiceDataAttribute_type" ),
-                        NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE__FC, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceDataAttribute_fc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_fc_feature",
+                                "_UI_ServiceDataAttribute_type" ),
+                        NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__FC, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -99,10 +99,10 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceDataAttribute_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceDataAttribute_name_feature",
-                                "_UI_TServiceDataAttribute_type" ),
-                        NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceDataAttribute_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_name_feature",
+                                "_UI_ServiceDataAttribute_type" ),
+                        NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -115,10 +115,10 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
     protected void addPresCondPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceDataAttribute_presCond_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceDataAttribute_presCond_feature",
-                        "_UI_TServiceDataAttribute_type" ),
-                NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE__PRES_COND, true, false, false,
+                getString( "_UI_ServiceDataAttribute_presCond_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_presCond_feature",
+                        "_UI_ServiceDataAttribute_type" ),
+                NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__PRES_COND, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -131,10 +131,10 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
     protected void addPresCondArgsPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceDataAttribute_presCondArgs_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceDataAttribute_presCondArgs_feature",
-                        "_UI_TServiceDataAttribute_type" ),
-                NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS, true, false, false,
+                getString( "_UI_ServiceDataAttribute_presCondArgs_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_presCondArgs_feature",
+                        "_UI_ServiceDataAttribute_type" ),
+                NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -147,10 +147,10 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
     protected void addPresCondArgsIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceDataAttribute_presCondArgsID_feature" ),
+                        getResourceLocator(), getString( "_UI_ServiceDataAttribute_presCondArgsID_feature" ),
                         getString( "_UI_PropertyDescriptor_description",
-                                "_UI_TServiceDataAttribute_presCondArgsID_feature", "_UI_TServiceDataAttribute_type" ),
-                        NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, true, false, false,
+                                "_UI_ServiceDataAttribute_presCondArgsID_feature", "_UI_ServiceDataAttribute_type" ),
+                        NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -163,10 +163,10 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
     protected void addTypePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceDataAttribute_type_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceDataAttribute_type_feature",
-                                "_UI_TServiceDataAttribute_type" ),
-                        NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE__TYPE, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceDataAttribute_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_type_feature",
+                                "_UI_ServiceDataAttribute_type" ),
+                        NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__TYPE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -179,10 +179,10 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
     protected void addTypeKindPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceDataAttribute_typeKind_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceDataAttribute_typeKind_feature",
-                        "_UI_TServiceDataAttribute_type" ),
-                NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE__TYPE_KIND, true, false, false,
+                getString( "_UI_ServiceDataAttribute_typeKind_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_typeKind_feature",
+                        "_UI_ServiceDataAttribute_type" ),
+                NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__TYPE_KIND, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -193,13 +193,13 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
      * @generated
      */
     protected void addUnderlyingTypePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceDataAttribute_underlyingType_feature" ),
-                        getString( "_UI_PropertyDescriptor_description",
-                                "_UI_TServiceDataAttribute_underlyingType_feature", "_UI_TServiceDataAttribute_type" ),
-                        NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE, true, false, false,
-                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
+                getString( "_UI_ServiceDataAttribute_underlyingType_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_underlyingType_feature",
+                        "_UI_ServiceDataAttribute_type" ),
+                NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -211,22 +211,22 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
     protected void addUnderlyingTypeKindPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceDataAttribute_underlyingTypeKind_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceDataAttribute_underlyingTypeKind_feature",
-                        "_UI_TServiceDataAttribute_type" ),
-                NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND, true, false, false,
+                getString( "_UI_ServiceDataAttribute_underlyingTypeKind_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_underlyingTypeKind_feature",
+                        "_UI_ServiceDataAttribute_type" ),
+                NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TServiceDataAttribute.gif.
+     * This returns ServiceDataAttribute.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceDataAttribute" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceDataAttribute" ) );
     }
 
     /**
@@ -237,9 +237,9 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TServiceDataAttribute ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TServiceDataAttribute_type" )
-                : getString( "_UI_TServiceDataAttribute_type" ) + " " + label;
+        String label = ( ( ServiceDataAttribute ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_ServiceDataAttribute_type" )
+                : getString( "_UI_ServiceDataAttribute_type" ) + " " + label;
     }
 
     /**
@@ -253,16 +253,16 @@ public class TServiceDataAttributeItemProvider extends TDocumentedClassItemProvi
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TServiceDataAttribute.class ) ) {
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__FC:
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__NAME:
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND:
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE:
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE_KIND:
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
+        switch( notification.getFeatureID( ServiceDataAttribute.class ) ) {
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__FC:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceNSItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNSItemProvider.java
similarity index 62%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceNSItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNSItemProvider.java
index 4b18daef637b2fa20ae6928a232f73cceb0a86fa..3095b29f9c505cb45e0264a85bb1604d4110cdec 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceNSItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNSItemProvider.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,19 +37,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TServiceNSItemProvider extends TCopyrightedItemProvider {
+public class ServiceNSItemProvider extends CopyrightedItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TServiceNSItemProvider( AdapterFactory adapterFactory ) {
+    public ServiceNSItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -64,14 +64,14 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
         if( itemPropertyDescriptors == null ) {
             super.getPropertyDescriptors( object );
 
+            addReleasePropertyDescriptor( object );
+            addVersionPropertyDescriptor( object );
             addDescIDPropertyDescriptor( object );
             addIdPropertyDescriptor( object );
             addPublicationStagePropertyDescriptor( object );
-            addReleasePropertyDescriptor( object );
             addRevisionPropertyDescriptor( object );
             addUmlDatePropertyDescriptor( object );
             addUmlVersionPropertyDescriptor( object );
-            addVersionPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -85,10 +85,10 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void addDescIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNS_descID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNS_descID_feature",
-                                "_UI_TServiceNS_type" ),
-                        NsdPackage.Literals.TSERVICE_NS__DESC_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceNS_descID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceNS_descID_feature",
+                                "_UI_ServiceNS_type" ),
+                        NsdPackage.Literals.SERVICE_NS__DESC_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -101,10 +101,10 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void addIdPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNS_id_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNS_id_feature",
-                                "_UI_TServiceNS_type" ),
-                        NsdPackage.Literals.TSERVICE_NS__ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceNS_id_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceNS_id_feature",
+                                "_UI_ServiceNS_type" ),
+                        NsdPackage.Literals.SERVICE_NS__ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -117,10 +117,10 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void addPublicationStagePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNS_publicationStage_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNS_publicationStage_feature",
-                                "_UI_TServiceNS_type" ),
-                        NsdPackage.Literals.TSERVICE_NS__PUBLICATION_STAGE, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceNS_publicationStage_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceNS_publicationStage_feature",
+                                "_UI_ServiceNS_type" ),
+                        NsdPackage.Literals.SERVICE_NS__PUBLICATION_STAGE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -131,13 +131,13 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
      * @generated
      */
     protected void addReleasePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNS_release_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNS_release_feature",
-                                "_UI_TServiceNS_type" ),
-                        NsdPackage.Literals.TSERVICE_NS__RELEASE, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
+                getString( "_UI_NSDObjectWithVersionAndRelease_release_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_NSDObjectWithVersionAndRelease_release_feature",
+                        "_UI_NSDObjectWithVersionAndRelease_type" ),
+                NsdPackage.Literals.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -149,10 +149,10 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void addRevisionPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNS_revision_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNS_revision_feature",
-                                "_UI_TServiceNS_type" ),
-                        NsdPackage.Literals.TSERVICE_NS__REVISION, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceNS_revision_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceNS_revision_feature",
+                                "_UI_ServiceNS_type" ),
+                        NsdPackage.Literals.SERVICE_NS__REVISION, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -165,10 +165,10 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void addUmlDatePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNS_umlDate_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNS_umlDate_feature",
-                                "_UI_TServiceNS_type" ),
-                        NsdPackage.Literals.TSERVICE_NS__UML_DATE, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceNS_umlDate_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceNS_umlDate_feature",
+                                "_UI_ServiceNS_type" ),
+                        NsdPackage.Literals.SERVICE_NS__UML_DATE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -181,10 +181,10 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void addUmlVersionPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNS_umlVersion_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNS_umlVersion_feature",
-                                "_UI_TServiceNS_type" ),
-                        NsdPackage.Literals.TSERVICE_NS__UML_VERSION, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceNS_umlVersion_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceNS_umlVersion_feature",
+                                "_UI_ServiceNS_type" ),
+                        NsdPackage.Literals.SERVICE_NS__UML_VERSION, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -195,13 +195,13 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
      * @generated
      */
     protected void addVersionPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNS_version_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNS_version_feature",
-                                "_UI_TServiceNS_type" ),
-                        NsdPackage.Literals.TSERVICE_NS__VERSION, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
+                getString( "_UI_NSDObjectWithVersionAndRelease_version_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_NSDObjectWithVersionAndRelease_version_feature",
+                        "_UI_NSDObjectWithVersionAndRelease_type" ),
+                NsdPackage.Literals.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -216,13 +216,13 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_NS__CHANGES );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_NS__PRESENCE_CONDITIONS );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_NS__ABBREVIATIONS );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_NS__SERVICE_CD_CS );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_NS__CHANGES );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_NS__FUNCTIONAL_CONSTRAINTS );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_NS__PRESENCE_CONDITIONS );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_NS__ABBREVIATIONS );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_NS__SERVICE_TYPE_REALIZATIONS );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_NS__SERVICE_CD_CS );
         }
         return childrenFeatures;
     }
@@ -241,14 +241,14 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     }
 
     /**
-     * This returns TServiceNS.gif.
+     * This returns ServiceNS.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceNS" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceNS" ) );
     }
 
     /**
@@ -259,9 +259,9 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TServiceNS ) object ).getId();
-        return label == null || label.length() == 0 ? getString( "_UI_TServiceNS_type" )
-                : getString( "_UI_TServiceNS_type" ) + " " + label;
+        String label = ( ( ServiceNS ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_ServiceNS_type" )
+                : getString( "_UI_ServiceNS_type" ) + " " + label;
     }
 
     /**
@@ -275,24 +275,24 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TServiceNS.class ) ) {
-        case NsdPackage.TSERVICE_NS__DESC_ID:
-        case NsdPackage.TSERVICE_NS__ID:
-        case NsdPackage.TSERVICE_NS__PUBLICATION_STAGE:
-        case NsdPackage.TSERVICE_NS__RELEASE:
-        case NsdPackage.TSERVICE_NS__REVISION:
-        case NsdPackage.TSERVICE_NS__UML_DATE:
-        case NsdPackage.TSERVICE_NS__UML_VERSION:
-        case NsdPackage.TSERVICE_NS__VERSION:
+        switch( notification.getFeatureID( ServiceNS.class ) ) {
+        case NsdPackage.SERVICE_NS__RELEASE:
+        case NsdPackage.SERVICE_NS__VERSION:
+        case NsdPackage.SERVICE_NS__DESC_ID:
+        case NsdPackage.SERVICE_NS__ID:
+        case NsdPackage.SERVICE_NS__PUBLICATION_STAGE:
+        case NsdPackage.SERVICE_NS__REVISION:
+        case NsdPackage.SERVICE_NS__UML_DATE:
+        case NsdPackage.SERVICE_NS__UML_VERSION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
-        case NsdPackage.TSERVICE_NS__CHANGES:
-        case NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS:
-        case NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS:
-        case NsdPackage.TSERVICE_NS__ABBREVIATIONS:
-        case NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS:
-        case NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
-        case NsdPackage.TSERVICE_NS__SERVICE_CD_CS:
+        case NsdPackage.SERVICE_NS__CHANGES:
+        case NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS:
+        case NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS:
+        case NsdPackage.SERVICE_NS__ABBREVIATIONS:
+        case NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS:
+        case NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
+        case NsdPackage.SERVICE_NS__SERVICE_CD_CS:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -310,26 +310,26 @@ public class TServiceNSItemProvider extends TCopyrightedItemProvider {
     protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_NS__CHANGES,
-                NsdFactory.eINSTANCE.createTChanges() ) );
+        newChildDescriptors.add(
+                createChildParameter( NsdPackage.Literals.SERVICE_NS__CHANGES, NsdFactory.eINSTANCE.createChanges() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS,
-                NsdFactory.eINSTANCE.createTFunctionalConstraints() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_NS__FUNCTIONAL_CONSTRAINTS,
+                NsdFactory.eINSTANCE.createFunctionalConstraints() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_NS__PRESENCE_CONDITIONS,
-                NsdFactory.eINSTANCE.createTPresenceConditions() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_NS__PRESENCE_CONDITIONS,
+                NsdFactory.eINSTANCE.createPresenceConditions() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_NS__ABBREVIATIONS,
-                NsdFactory.eINSTANCE.createTAbbreviations() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_NS__ABBREVIATIONS,
+                NsdFactory.eINSTANCE.createAbbreviations() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS,
-                NsdFactory.eINSTANCE.createTServiceTypeRealizations() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_NS__SERVICE_TYPE_REALIZATIONS,
+                NsdFactory.eINSTANCE.createServiceTypeRealizations() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES,
-                NsdFactory.eINSTANCE.createTServiceConstructedAttributes() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES,
+                NsdFactory.eINSTANCE.createServiceConstructedAttributes() ) );
 
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_NS__SERVICE_CD_CS,
-                NsdFactory.eINSTANCE.createTServiceCDCs() ) );
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_NS__SERVICE_CD_CS,
+                NsdFactory.eINSTANCE.createServiceCDCs() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNsUsageItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNsUsageItemProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..4ae4d976247db74e27286ffcfd1f73c89069e1ae
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNsUsageItemProvider.java
@@ -0,0 +1,214 @@
+/**
+ *  Copyright (c) 2019 CentraleSupélec & EDF.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ * 
+ */
+package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
+
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ServiceNsUsageItemProvider extends NSDObjectWithVersionAndReleaseItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public ServiceNsUsageItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addIdPropertyDescriptor( object );
+            addPublicationStagePropertyDescriptor( object );
+            addRevisionPropertyDescriptor( object );
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the Id feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addIdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_ServiceNsUsage_id_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceNsUsage_id_feature",
+                                "_UI_ServiceNsUsage_type" ),
+                        NsdPackage.Literals.SERVICE_NS_USAGE__ID, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+    }
+
+    /**
+     * This adds a property descriptor for the Publication Stage feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addPublicationStagePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_ServiceNsUsage_publicationStage_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceNsUsage_publicationStage_feature",
+                                "_UI_ServiceNsUsage_type" ),
+                        NsdPackage.Literals.SERVICE_NS_USAGE__PUBLICATION_STAGE, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+    }
+
+    /**
+     * This adds a property descriptor for the Revision feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addRevisionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_ServiceNsUsage_revision_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceNsUsage_revision_feature",
+                                "_UI_ServiceNsUsage_type" ),
+                        NsdPackage.Literals.SERVICE_NS_USAGE__REVISION, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_NS_USAGE__APPLIES_TO );
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
+        // Check the type of the specified child object and return the proper feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature( object, child );
+    }
+
+    /**
+     * This returns ServiceNsUsage.gif.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceNsUsage" ) );
+    }
+
+    /**
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String getText( Object object ) {
+        String label = ( ( ServiceNsUsage ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_ServiceNsUsage_type" )
+                : getString( "_UI_ServiceNsUsage_type" ) + " " + label;
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ServiceNsUsage.class ) ) {
+        case NsdPackage.SERVICE_NS_USAGE__ID:
+        case NsdPackage.SERVICE_NS_USAGE__PUBLICATION_STAGE:
+        case NsdPackage.SERVICE_NS_USAGE__REVISION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case NsdPackage.SERVICE_NS_USAGE__APPLIES_TO:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
+        }
+        super.notifyChanged( notification );
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_NS_USAGE__APPLIES_TO,
+                NsdFactory.eINSTANCE.createAppliesToType() ) );
+    }
+
+}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceParameterItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceParameterItemProvider.java
similarity index 71%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceParameterItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceParameterItemProvider.java
index 5699081acdf07bcd98d3fcb6de94da865e9e5004..43f4184d648aabbe159ce0cdd9dac8dfa4c6b177 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceParameterItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceParameterItemProvider.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TServiceParameterItemProvider extends TDocumentedClassItemProvider {
+public class ServiceParameterItemProvider extends DocumentedClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TServiceParameterItemProvider( AdapterFactory adapterFactory ) {
+    public ServiceParameterItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -80,10 +80,10 @@ public class TServiceParameterItemProvider extends TDocumentedClassItemProvider
     protected void addDefaultValuePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceParameter_defaultValue_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceParameter_defaultValue_feature",
-                                "_UI_TServiceParameter_type" ),
-                        NsdPackage.Literals.TSERVICE_PARAMETER__DEFAULT_VALUE, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceParameter_defaultValue_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceParameter_defaultValue_feature",
+                                "_UI_ServiceParameter_type" ),
+                        NsdPackage.Literals.SERVICE_PARAMETER__DEFAULT_VALUE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -96,10 +96,10 @@ public class TServiceParameterItemProvider extends TDocumentedClassItemProvider
     protected void addMaxValuePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceParameter_maxValue_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceParameter_maxValue_feature",
-                                "_UI_TServiceParameter_type" ),
-                        NsdPackage.Literals.TSERVICE_PARAMETER__MAX_VALUE, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceParameter_maxValue_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceParameter_maxValue_feature",
+                                "_UI_ServiceParameter_type" ),
+                        NsdPackage.Literals.SERVICE_PARAMETER__MAX_VALUE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -112,10 +112,10 @@ public class TServiceParameterItemProvider extends TDocumentedClassItemProvider
     protected void addMinValuePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceParameter_minValue_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceParameter_minValue_feature",
-                                "_UI_TServiceParameter_type" ),
-                        NsdPackage.Literals.TSERVICE_PARAMETER__MIN_VALUE, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceParameter_minValue_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceParameter_minValue_feature",
+                                "_UI_ServiceParameter_type" ),
+                        NsdPackage.Literals.SERVICE_PARAMETER__MIN_VALUE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -128,10 +128,10 @@ public class TServiceParameterItemProvider extends TDocumentedClassItemProvider
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceParameter_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceParameter_name_feature",
-                                "_UI_TServiceParameter_type" ),
-                        NsdPackage.Literals.TSERVICE_PARAMETER__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceParameter_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceParameter_name_feature",
+                                "_UI_ServiceParameter_type" ),
+                        NsdPackage.Literals.SERVICE_PARAMETER__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -144,10 +144,10 @@ public class TServiceParameterItemProvider extends TDocumentedClassItemProvider
     protected void addTypePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceParameter_type_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceParameter_type_feature",
-                                "_UI_TServiceParameter_type" ),
-                        NsdPackage.Literals.TSERVICE_PARAMETER__TYPE, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceParameter_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceParameter_type_feature",
+                                "_UI_ServiceParameter_type" ),
+                        NsdPackage.Literals.SERVICE_PARAMETER__TYPE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -160,22 +160,22 @@ public class TServiceParameterItemProvider extends TDocumentedClassItemProvider
     protected void addTypeKindPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceParameter_typeKind_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceParameter_typeKind_feature",
-                                "_UI_TServiceParameter_type" ),
-                        NsdPackage.Literals.TSERVICE_PARAMETER__TYPE_KIND, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceParameter_typeKind_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceParameter_typeKind_feature",
+                                "_UI_ServiceParameter_type" ),
+                        NsdPackage.Literals.SERVICE_PARAMETER__TYPE_KIND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TServiceParameter.gif.
+     * This returns ServiceParameter.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceParameter" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceParameter" ) );
     }
 
     /**
@@ -186,9 +186,9 @@ public class TServiceParameterItemProvider extends TDocumentedClassItemProvider
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TServiceParameter ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TServiceParameter_type" )
-                : getString( "_UI_TServiceParameter_type" ) + " " + label;
+        String label = ( ( ServiceParameter ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_ServiceParameter_type" )
+                : getString( "_UI_ServiceParameter_type" ) + " " + label;
     }
 
     /**
@@ -202,13 +202,13 @@ public class TServiceParameterItemProvider extends TDocumentedClassItemProvider
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TServiceParameter.class ) ) {
-        case NsdPackage.TSERVICE_PARAMETER__DEFAULT_VALUE:
-        case NsdPackage.TSERVICE_PARAMETER__MAX_VALUE:
-        case NsdPackage.TSERVICE_PARAMETER__MIN_VALUE:
-        case NsdPackage.TSERVICE_PARAMETER__NAME:
-        case NsdPackage.TSERVICE_PARAMETER__TYPE:
-        case NsdPackage.TSERVICE_PARAMETER__TYPE_KIND:
+        switch( notification.getFeatureID( ServiceParameter.class ) ) {
+        case NsdPackage.SERVICE_PARAMETER__DEFAULT_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MAX_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MIN_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__NAME:
+        case NsdPackage.SERVICE_PARAMETER__TYPE:
+        case NsdPackage.SERVICE_PARAMETER__TYPE_KIND:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeItemProvider.java
index faa28dfb73622e1fb03988d5b00670ccf720f63c..fd7139188f450bc9f0b38538e09b89913eb25018 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeItemProvider.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind;
 
 import java.util.Collection;
 import java.util.List;
@@ -111,7 +111,7 @@ public class ServiceTypeItemProvider extends ItemProviderAdapter implements IEdi
      */
     @Override
     public String getText( Object object ) {
-        TACSIServicesKind labelValue = ( ( ServiceType ) object ).getName();
+        ACSIServicesKind labelValue = ( ( ServiceType ) object ).getName();
         String label = labelValue == null ? null : labelValue.toString();
         return label == null || label.length() == 0 ? getString( "_UI_ServiceType_type" )
                 : getString( "_UI_ServiceType_type" ) + " " + label;
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceTypeRealizationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeRealizationItemProvider.java
similarity index 64%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceTypeRealizationItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeRealizationItemProvider.java
index b68b66cbf0f61a7df5109c9b10d3cd0a111cd2ad..df10a59c0330b077018210583f2917b9f8e413ef 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceTypeRealizationItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeRealizationItemProvider.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization;
 
 import java.util.Collection;
 import java.util.List;
@@ -42,12 +42,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class ServiceTypeRealizationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -55,7 +55,7 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
      * <!-- end-user-doc -->
      * @generated
      */
-    public TServiceTypeRealizationItemProvider( AdapterFactory adapterFactory ) {
+    public ServiceTypeRealizationItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -90,10 +90,10 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
     protected void addFcPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceTypeRealization_fc_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceTypeRealization_fc_feature",
-                                "_UI_TServiceTypeRealization_type" ),
-                        NsdPackage.Literals.TSERVICE_TYPE_REALIZATION__FC, true, false, false,
+                        getResourceLocator(), getString( "_UI_ServiceTypeRealization_fc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceTypeRealization_fc_feature",
+                                "_UI_ServiceTypeRealization_type" ),
+                        NsdPackage.Literals.SERVICE_TYPE_REALIZATION__FC, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -104,13 +104,13 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
      * @generated
      */
     protected void addNamePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add( createItemPropertyDescriptor(
-                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceTypeRealization_name_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceTypeRealization_name_feature",
-                        "_UI_TServiceTypeRealization_type" ),
-                NsdPackage.Literals.TSERVICE_TYPE_REALIZATION__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_ServiceTypeRealization_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceTypeRealization_name_feature",
+                                "_UI_ServiceTypeRealization_type" ),
+                        NsdPackage.Literals.SERVICE_TYPE_REALIZATION__NAME, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -122,10 +122,10 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
     protected void addPresCondPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceTypeRealization_presCond_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceTypeRealization_presCond_feature",
-                        "_UI_TServiceTypeRealization_type" ),
-                NsdPackage.Literals.TSERVICE_TYPE_REALIZATION__PRES_COND, true, false, false,
+                getString( "_UI_ServiceTypeRealization_presCond_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_ServiceTypeRealization_presCond_feature",
+                        "_UI_ServiceTypeRealization_type" ),
+                NsdPackage.Literals.SERVICE_TYPE_REALIZATION__PRES_COND, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -136,13 +136,13 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
      * @generated
      */
     protected void addPresCondArgsPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add( createItemPropertyDescriptor(
-                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceTypeRealization_presCondArgs_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceTypeRealization_presCondArgs_feature",
-                        "_UI_TServiceTypeRealization_type" ),
-                NsdPackage.Literals.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_ServiceTypeRealization_presCondArgs_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_ServiceTypeRealization_presCondArgs_feature", "_UI_ServiceTypeRealization_type" ),
+                        NsdPackage.Literals.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -154,10 +154,10 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
     protected void addPresCondArgsIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceTypeRealization_presCondArgsID_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceTypeRealization_presCondArgsID_feature",
-                        "_UI_TServiceTypeRealization_type" ),
-                NsdPackage.Literals.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID, true, false, false,
+                getString( "_UI_ServiceTypeRealization_presCondArgsID_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_ServiceTypeRealization_presCondArgsID_feature",
+                        "_UI_ServiceTypeRealization_type" ),
+                NsdPackage.Literals.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -168,13 +168,13 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
      * @generated
      */
     protected void addTypePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add( createItemPropertyDescriptor(
-                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceTypeRealization_type_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceTypeRealization_type_feature",
-                        "_UI_TServiceTypeRealization_type" ),
-                NsdPackage.Literals.TSERVICE_TYPE_REALIZATION__TYPE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_ServiceTypeRealization_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceTypeRealization_type_feature",
+                                "_UI_ServiceTypeRealization_type" ),
+                        NsdPackage.Literals.SERVICE_TYPE_REALIZATION__TYPE, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
@@ -186,22 +186,22 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
     protected void addTypeKindPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TServiceTypeRealization_typeKind_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TServiceTypeRealization_typeKind_feature",
-                        "_UI_TServiceTypeRealization_type" ),
-                NsdPackage.Literals.TSERVICE_TYPE_REALIZATION__TYPE_KIND, true, false, false,
+                getString( "_UI_ServiceTypeRealization_typeKind_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_ServiceTypeRealization_typeKind_feature",
+                        "_UI_ServiceTypeRealization_type" ),
+                NsdPackage.Literals.SERVICE_TYPE_REALIZATION__TYPE_KIND, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TServiceTypeRealization.gif.
+     * This returns ServiceTypeRealization.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceTypeRealization" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceTypeRealization" ) );
     }
 
     /**
@@ -212,9 +212,9 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TServiceTypeRealization ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TServiceTypeRealization_type" )
-                : getString( "_UI_TServiceTypeRealization_type" ) + " " + label;
+        String label = ( ( ServiceTypeRealization ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_ServiceTypeRealization_type" )
+                : getString( "_UI_ServiceTypeRealization_type" ) + " " + label;
     }
 
     /**
@@ -228,14 +228,14 @@ public class TServiceTypeRealizationItemProvider extends ItemProviderAdapter imp
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TServiceTypeRealization.class ) ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__FC:
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__NAME:
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND:
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE:
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE_KIND:
+        switch( notification.getFeatureID( ServiceTypeRealization.class ) ) {
+        case NsdPackage.SERVICE_TYPE_REALIZATION__FC:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__NAME:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE_KIND:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceTypeRealizationsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeRealizationsItemProvider.java
similarity index 83%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceTypeRealizationsItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeRealizationsItemProvider.java
index 476e0dd0d0ce775c885eec6b0428fb42a7c0d26b..dca1ef8cc36cf8452beeebecf529740c9e161253 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceTypeRealizationsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeRealizationsItemProvider.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,12 +43,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TServiceTypeRealizationsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class ServiceTypeRealizationsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
         IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier.
@@ -56,7 +56,7 @@ public class TServiceTypeRealizationsItemProvider extends ItemProviderAdapter im
      * <!-- end-user-doc -->
      * @generated
      */
-    public TServiceTypeRealizationsItemProvider( AdapterFactory adapterFactory ) {
+    public ServiceTypeRealizationsItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,7 +87,7 @@ public class TServiceTypeRealizationsItemProvider extends ItemProviderAdapter im
     public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
         if( childrenFeatures == null ) {
             super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION );
+            childrenFeatures.add( NsdPackage.Literals.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION );
         }
         return childrenFeatures;
     }
@@ -106,14 +106,14 @@ public class TServiceTypeRealizationsItemProvider extends ItemProviderAdapter im
     }
 
     /**
-     * This returns TServiceTypeRealizations.gif.
+     * This returns ServiceTypeRealizations.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceTypeRealizations" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceTypeRealizations" ) );
     }
 
     /**
@@ -124,7 +124,7 @@ public class TServiceTypeRealizationsItemProvider extends ItemProviderAdapter im
      */
     @Override
     public String getText( Object object ) {
-        return getString( "_UI_TServiceTypeRealizations_type" );
+        return getString( "_UI_ServiceTypeRealizations_type" );
     }
 
     /**
@@ -138,8 +138,8 @@ public class TServiceTypeRealizationsItemProvider extends ItemProviderAdapter im
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TServiceTypeRealizations.class ) ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
+        switch( notification.getFeatureID( ServiceTypeRealizations.class ) ) {
+        case NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
             return;
         }
@@ -158,12 +158,12 @@ public class TServiceTypeRealizationsItemProvider extends ItemProviderAdapter im
         super.collectNewChildDescriptors( newChildDescriptors, object );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION,
-                        NsdFactory.eINSTANCE.createTConstructedAttribute() ) );
+                .add( createChildParameter( NsdPackage.Literals.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION,
+                        NsdFactory.eINSTANCE.createConstructedAttribute() ) );
 
         newChildDescriptors
-                .add( createChildParameter( NsdPackage.Literals.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION,
-                        NsdFactory.eINSTANCE.createTServiceConstructedAttribute() ) );
+                .add( createChildParameter( NsdPackage.Literals.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION,
+                        NsdFactory.eINSTANCE.createServiceConstructedAttribute() ) );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TSubDataAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataAttributeItemProvider.java
similarity index 67%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TSubDataAttributeItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataAttributeItemProvider.java
index 3e16fc9f1d4c649ea7ba0cbbeb75efb70fde47f7..a3f32c8e9234f78e87ef9259266f8013918b01d2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TSubDataAttributeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataAttributeItemProvider.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider {
+public class SubDataAttributeItemProvider extends DocumentedClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TSubDataAttributeItemProvider( AdapterFactory adapterFactory ) {
+    public SubDataAttributeItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -87,10 +87,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addDefaultValuePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_defaultValue_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_defaultValue_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_defaultValue_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_defaultValue_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__DEFAULT_VALUE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -103,10 +103,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addIsArrayPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_isArray_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_isArray_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__IS_ARRAY, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_isArray_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_isArray_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__IS_ARRAY, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -119,10 +119,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addMaxIndexAttributePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TSubDataAttribute_maxIndexAttribute_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_maxIndexAttribute_feature",
-                        "_UI_TSubDataAttribute_type" ),
-                NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, true, false, false,
+                getString( "_UI_SubDataAttribute_maxIndexAttribute_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_maxIndexAttribute_feature",
+                        "_UI_SubDataAttribute_type" ),
+                NsdPackage.Literals.SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -135,10 +135,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addMaxValuePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_maxValue_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_maxValue_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__MAX_VALUE, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_maxValue_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_maxValue_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__MAX_VALUE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -151,10 +151,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addMinIndexPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_minIndex_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_minIndex_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__MIN_INDEX, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_minIndex_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_minIndex_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__MIN_INDEX, true, false, false,
                         ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
     }
 
@@ -167,10 +167,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addMinValuePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_minValue_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_minValue_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__MIN_VALUE, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_minValue_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_minValue_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__MIN_VALUE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -183,10 +183,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_name_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_name_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -199,10 +199,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addPresCondPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_presCond_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_presCond_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__PRES_COND, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_presCond_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_presCond_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__PRES_COND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -215,10 +215,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addPresCondArgsPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_presCondArgs_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_presCondArgs_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_presCondArgs_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_presCondArgs_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -231,10 +231,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addPresCondArgsIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add( createItemPropertyDescriptor(
                 ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TSubDataAttribute_presCondArgsID_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_presCondArgsID_feature",
-                        "_UI_TSubDataAttribute_type" ),
-                NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, true, false, false,
+                getString( "_UI_SubDataAttribute_presCondArgsID_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_presCondArgsID_feature",
+                        "_UI_SubDataAttribute_type" ),
+                NsdPackage.Literals.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, true, false, false,
                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -247,10 +247,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addSizeAttributePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_sizeAttribute_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_sizeAttribute_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_sizeAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_sizeAttribute_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -263,10 +263,10 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addTypePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_type_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_type_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__TYPE, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_type_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__TYPE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -279,22 +279,22 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     protected void addTypeKindPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataAttribute_typeKind_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataAttribute_typeKind_feature",
-                                "_UI_TSubDataAttribute_type" ),
-                        NsdPackage.Literals.TSUB_DATA_ATTRIBUTE__TYPE_KIND, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataAttribute_typeKind_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_typeKind_feature",
+                                "_UI_SubDataAttribute_type" ),
+                        NsdPackage.Literals.SUB_DATA_ATTRIBUTE__TYPE_KIND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TSubDataAttribute.gif.
+     * This returns SubDataAttribute.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TSubDataAttribute" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SubDataAttribute" ) );
     }
 
     /**
@@ -305,9 +305,9 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TSubDataAttribute ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TSubDataAttribute_type" )
-                : getString( "_UI_TSubDataAttribute_type" ) + " " + label;
+        String label = ( ( SubDataAttribute ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_SubDataAttribute_type" )
+                : getString( "_UI_SubDataAttribute_type" ) + " " + label;
     }
 
     /**
@@ -321,20 +321,20 @@ public class TSubDataAttributeItemProvider extends TDocumentedClassItemProvider
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TSubDataAttribute.class ) ) {
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__IS_ARRAY:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_VALUE:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_INDEX:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_VALUE:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__NAME:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE:
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE_KIND:
+        switch( notification.getFeatureID( SubDataAttribute.class ) ) {
+        case NsdPackage.SUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TSubDataObjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataObjectItemProvider.java
similarity index 66%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TSubDataObjectItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataObjectItemProvider.java
index e250e5ae41f46ff8da17eb0d8f228228712e1e16..6b01830f85df678dcf32c59d4d09a4942047371e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TSubDataObjectItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataObjectItemProvider.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
+public class SubDataObjectItemProvider extends DocumentedClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TSubDataObjectItemProvider( AdapterFactory adapterFactory ) {
+    public SubDataObjectItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -85,10 +85,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addIsArrayPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_isArray_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_isArray_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__IS_ARRAY, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_isArray_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_isArray_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__IS_ARRAY, true, false, false,
                         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) );
     }
 
@@ -101,10 +101,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addMaxIndexAttributePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_maxIndexAttribute_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_maxIndexAttribute_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_maxIndexAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_maxIndexAttribute_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -117,10 +117,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addMinIndexPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_minIndex_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_minIndex_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__MIN_INDEX, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_minIndex_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_minIndex_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__MIN_INDEX, true, false, false,
                         ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
     }
 
@@ -133,10 +133,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addNamePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_name_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_name_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__NAME, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_name_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__NAME, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -149,10 +149,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addPresCondPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_presCond_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_presCond_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__PRES_COND, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_presCond_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_presCond_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__PRES_COND, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -165,10 +165,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addPresCondArgsPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_presCondArgs_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_presCondArgs_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__PRES_COND_ARGS, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_presCondArgs_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_presCondArgs_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__PRES_COND_ARGS, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -181,10 +181,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addPresCondArgsIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_presCondArgsID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_presCondArgsID_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__PRES_COND_ARGS_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_presCondArgsID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_presCondArgsID_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__PRES_COND_ARGS_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -197,10 +197,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addSizeAttributePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_sizeAttribute_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_sizeAttribute_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__SIZE_ATTRIBUTE, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_sizeAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_sizeAttribute_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__SIZE_ATTRIBUTE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -213,10 +213,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addTypePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_type_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_type_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__TYPE, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_type_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__TYPE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -229,10 +229,10 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     protected void addUnderlyingTypePropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TSubDataObject_underlyingType_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_underlyingType_feature",
-                                "_UI_TSubDataObject_type" ),
-                        NsdPackage.Literals.TSUB_DATA_OBJECT__UNDERLYING_TYPE, true, false, false,
+                        getResourceLocator(), getString( "_UI_SubDataObject_underlyingType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_underlyingType_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__UNDERLYING_TYPE, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
@@ -243,24 +243,24 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
      * @generated
      */
     protected void addUnderlyingTypeKindPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add( createItemPropertyDescriptor(
-                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(),
-                getString( "_UI_TSubDataObject_underlyingTypeKind_feature" ),
-                getString( "_UI_PropertyDescriptor_description", "_UI_TSubDataObject_underlyingTypeKind_feature",
-                        "_UI_TSubDataObject_type" ),
-                NsdPackage.Literals.TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(), getString( "_UI_SubDataObject_underlyingTypeKind_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_underlyingTypeKind_feature",
+                                "_UI_SubDataObject_type" ),
+                        NsdPackage.Literals.SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND, true, false, false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TSubDataObject.gif.
+     * This returns SubDataObject.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TSubDataObject" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SubDataObject" ) );
     }
 
     /**
@@ -271,9 +271,9 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        String label = ( ( TSubDataObject ) object ).getName();
-        return label == null || label.length() == 0 ? getString( "_UI_TSubDataObject_type" )
-                : getString( "_UI_TSubDataObject_type" ) + " " + label;
+        String label = ( ( SubDataObject ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_SubDataObject_type" )
+                : getString( "_UI_SubDataObject_type" ) + " " + label;
     }
 
     /**
@@ -287,18 +287,18 @@ public class TSubDataObjectItemProvider extends TDocumentedClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TSubDataObject.class ) ) {
-        case NsdPackage.TSUB_DATA_OBJECT__IS_ARRAY:
-        case NsdPackage.TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
-        case NsdPackage.TSUB_DATA_OBJECT__MIN_INDEX:
-        case NsdPackage.TSUB_DATA_OBJECT__NAME:
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND:
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS:
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS_ID:
-        case NsdPackage.TSUB_DATA_OBJECT__SIZE_ATTRIBUTE:
-        case NsdPackage.TSUB_DATA_OBJECT__TYPE:
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE:
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
+        switch( notification.getFeatureID( SubDataObject.class ) ) {
+        case NsdPackage.SUB_DATA_OBJECT__IS_ARRAY:
+        case NsdPackage.SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__MIN_INDEX:
+        case NsdPackage.SUB_DATA_OBJECT__NAME:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_OBJECT__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TChangesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TChangesItemProvider.java
deleted file mode 100644
index aba4b48c98021a231ac8932ec12f80f3e9cd9c4c..0000000000000000000000000000000000000000
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TChangesItemProvider.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- *  Copyright (c) 2019 CentraleSupélec & EDF.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- * 
- */
-package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
-
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TChangesItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public TChangesItemProvider( AdapterFactory adapterFactory ) {
-        super( adapterFactory );
-    }
-
-    /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
-        if( itemPropertyDescriptors == null ) {
-            super.getPropertyDescriptors( object );
-
-            addChangesIDPropertyDescriptor( object );
-            addDatePropertyDescriptor( object );
-            addReleasePropertyDescriptor( object );
-            addRevisionPropertyDescriptor( object );
-            addTissuesPropertyDescriptor( object );
-            addVersionPropertyDescriptor( object );
-        }
-        return itemPropertyDescriptors;
-    }
-
-    /**
-     * This adds a property descriptor for the Changes ID feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addChangesIDPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TChanges_changesID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TChanges_changesID_feature",
-                                "_UI_TChanges_type" ),
-                        NsdPackage.Literals.TCHANGES__CHANGES_ID, true, false, false,
-                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This adds a property descriptor for the Date feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addDatePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TChanges_date_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TChanges_date_feature",
-                                "_UI_TChanges_type" ),
-                        NsdPackage.Literals.TCHANGES__DATE, true, false, false,
-                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This adds a property descriptor for the Release feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addReleasePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TChanges_release_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TChanges_release_feature",
-                                "_UI_TChanges_type" ),
-                        NsdPackage.Literals.TCHANGES__RELEASE, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This adds a property descriptor for the Revision feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addRevisionPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TChanges_revision_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TChanges_revision_feature",
-                                "_UI_TChanges_type" ),
-                        NsdPackage.Literals.TCHANGES__REVISION, true, false, false,
-                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This adds a property descriptor for the Tissues feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addTissuesPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TChanges_tissues_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TChanges_tissues_feature",
-                                "_UI_TChanges_type" ),
-                        NsdPackage.Literals.TCHANGES__TISSUES, true, false, false,
-                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This adds a property descriptor for the Version feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addVersionPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TChanges_version_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TChanges_version_feature",
-                                "_UI_TChanges_type" ),
-                        NsdPackage.Literals.TCHANGES__VERSION, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This returns TChanges.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TChanges" ) );
-    }
-
-    /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String getText( Object object ) {
-        String label = ( ( TChanges ) object ).getChangesID();
-        return label == null || label.length() == 0 ? getString( "_UI_TChanges_type" )
-                : getString( "_UI_TChanges_type" ) + " " + label;
-    }
-
-    /**
-     * This handles model notifications by calling {@link #updateChildren} to update any cached
-     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void notifyChanged( Notification notification ) {
-        updateChildren( notification );
-
-        switch( notification.getFeatureID( TChanges.class ) ) {
-        case NsdPackage.TCHANGES__CHANGES_ID:
-        case NsdPackage.TCHANGES__DATE:
-        case NsdPackage.TCHANGES__RELEASE:
-        case NsdPackage.TCHANGES__REVISION:
-        case NsdPackage.TCHANGES__TISSUES:
-        case NsdPackage.TCHANGES__VERSION:
-            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
-            return;
-        }
-        super.notifyChanged( notification );
-    }
-
-    /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-     * that can be created under this object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
-        super.collectNewChildDescriptors( newChildDescriptors, object );
-    }
-
-    /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return NSDEditPlugin.INSTANCE;
-    }
-
-}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TPresenceConditionsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TPresenceConditionsItemProvider.java
deleted file mode 100644
index a57447008eda82f3961d83f0e930dbc669c6f44a..0000000000000000000000000000000000000000
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TPresenceConditionsItemProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- *  Copyright (c) 2019 CentraleSupélec & EDF.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- * 
- */
-package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
-
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TPresenceConditionsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public TPresenceConditionsItemProvider( AdapterFactory adapterFactory ) {
-        super( adapterFactory );
-    }
-
-    /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
-        if( itemPropertyDescriptors == null ) {
-            super.getPropertyDescriptors( object );
-
-        }
-        return itemPropertyDescriptors;
-    }
-
-    /**
-     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
-        if( childrenFeatures == null ) {
-            super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TPRESENCE_CONDITIONS__PRESENCE_CONDITION );
-        }
-        return childrenFeatures;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature( Object object, Object child ) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
-
-        return super.getChildFeature( object, child );
-    }
-
-    /**
-     * This returns TPresenceConditions.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TPresenceConditions" ) );
-    }
-
-    /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String getText( Object object ) {
-        return getString( "_UI_TPresenceConditions_type" );
-    }
-
-    /**
-     * This handles model notifications by calling {@link #updateChildren} to update any cached
-     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void notifyChanged( Notification notification ) {
-        updateChildren( notification );
-
-        switch( notification.getFeatureID( TPresenceConditions.class ) ) {
-        case NsdPackage.TPRESENCE_CONDITIONS__PRESENCE_CONDITION:
-            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
-            return;
-        }
-        super.notifyChanged( notification );
-    }
-
-    /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-     * that can be created under this object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
-        super.collectNewChildDescriptors( newChildDescriptors, object );
-
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TPRESENCE_CONDITIONS__PRESENCE_CONDITION,
-                NsdFactory.eINSTANCE.createTPresenceCondition() ) );
-    }
-
-    /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return NSDEditPlugin.INSTANCE;
-    }
-
-}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceNsUsageItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceNsUsageItemProvider.java
deleted file mode 100644
index 5e5fbed167e9192a28b674af4d49914a086841da..0000000000000000000000000000000000000000
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TServiceNsUsageItemProvider.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- *  Copyright (c) 2019 CentraleSupélec & EDF.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- * 
- */
-package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
-
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TServiceNsUsageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public TServiceNsUsageItemProvider( AdapterFactory adapterFactory ) {
-        super( adapterFactory );
-    }
-
-    /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
-        if( itemPropertyDescriptors == null ) {
-            super.getPropertyDescriptors( object );
-
-            addIdPropertyDescriptor( object );
-            addPublicationStagePropertyDescriptor( object );
-            addReleasePropertyDescriptor( object );
-            addRevisionPropertyDescriptor( object );
-            addVersionPropertyDescriptor( object );
-        }
-        return itemPropertyDescriptors;
-    }
-
-    /**
-     * This adds a property descriptor for the Id feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addIdPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNsUsage_id_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNsUsage_id_feature",
-                                "_UI_TServiceNsUsage_type" ),
-                        NsdPackage.Literals.TSERVICE_NS_USAGE__ID, true, false, false,
-                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This adds a property descriptor for the Publication Stage feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addPublicationStagePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNsUsage_publicationStage_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNsUsage_publicationStage_feature",
-                                "_UI_TServiceNsUsage_type" ),
-                        NsdPackage.Literals.TSERVICE_NS_USAGE__PUBLICATION_STAGE, true, false, false,
-                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This adds a property descriptor for the Release feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addReleasePropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNsUsage_release_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNsUsage_release_feature",
-                                "_UI_TServiceNsUsage_type" ),
-                        NsdPackage.Literals.TSERVICE_NS_USAGE__RELEASE, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This adds a property descriptor for the Revision feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addRevisionPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNsUsage_revision_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNsUsage_revision_feature",
-                                "_UI_TServiceNsUsage_type" ),
-                        NsdPackage.Literals.TSERVICE_NS_USAGE__REVISION, true, false, false,
-                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This adds a property descriptor for the Version feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addVersionPropertyDescriptor( Object object ) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TServiceNsUsage_version_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TServiceNsUsage_version_feature",
-                                "_UI_TServiceNsUsage_type" ),
-                        NsdPackage.Literals.TSERVICE_NS_USAGE__VERSION, true, false, false,
-                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) );
-    }
-
-    /**
-     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
-        if( childrenFeatures == null ) {
-            super.getChildrenFeatures( object );
-            childrenFeatures.add( NsdPackage.Literals.TSERVICE_NS_USAGE__APPLIES_TO );
-        }
-        return childrenFeatures;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature( Object object, Object child ) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
-
-        return super.getChildFeature( object, child );
-    }
-
-    /**
-     * This returns TServiceNsUsage.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TServiceNsUsage" ) );
-    }
-
-    /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String getText( Object object ) {
-        String label = ( ( TServiceNsUsage ) object ).getId();
-        return label == null || label.length() == 0 ? getString( "_UI_TServiceNsUsage_type" )
-                : getString( "_UI_TServiceNsUsage_type" ) + " " + label;
-    }
-
-    /**
-     * This handles model notifications by calling {@link #updateChildren} to update any cached
-     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void notifyChanged( Notification notification ) {
-        updateChildren( notification );
-
-        switch( notification.getFeatureID( TServiceNsUsage.class ) ) {
-        case NsdPackage.TSERVICE_NS_USAGE__ID:
-        case NsdPackage.TSERVICE_NS_USAGE__PUBLICATION_STAGE:
-        case NsdPackage.TSERVICE_NS_USAGE__RELEASE:
-        case NsdPackage.TSERVICE_NS_USAGE__REVISION:
-        case NsdPackage.TSERVICE_NS_USAGE__VERSION:
-            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
-            return;
-        case NsdPackage.TSERVICE_NS_USAGE__APPLIES_TO:
-            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
-            return;
-        }
-        super.notifyChanged( notification );
-    }
-
-    /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-     * that can be created under this object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
-        super.collectNewChildDescriptors( newChildDescriptors, object );
-
-        newChildDescriptors.add( createChildParameter( NsdPackage.Literals.TSERVICE_NS_USAGE__APPLIES_TO,
-                NsdFactory.eINSTANCE.createAppliesToType() ) );
-    }
-
-    /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return NSDEditPlugin.INSTANCE;
-    }
-
-}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TTitledClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TitledClassItemProvider.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TTitledClassItemProvider.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TitledClassItemProvider.java
index 834eb4dddbfeeada36a1c137fc8e0c7ce9a9b6b3..f1802407155b2f062c9f4e53fb94c8dd3dfe9f3d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TTitledClassItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TitledClassItemProvider.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,19 +34,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass} object.
+ * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TTitledClassItemProvider extends TDocumentedClassItemProvider {
+public class TitledClassItemProvider extends DocumentedClassItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TTitledClassItemProvider( AdapterFactory adapterFactory ) {
+    public TitledClassItemProvider( AdapterFactory adapterFactory ) {
         super( adapterFactory );
     }
 
@@ -75,22 +75,22 @@ public class TTitledClassItemProvider extends TDocumentedClassItemProvider {
     protected void addTitleIDPropertyDescriptor( Object object ) {
         itemPropertyDescriptors.add(
                 createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
-                        getResourceLocator(), getString( "_UI_TTitledClass_titleID_feature" ),
-                        getString( "_UI_PropertyDescriptor_description", "_UI_TTitledClass_titleID_feature",
-                                "_UI_TTitledClass_type" ),
-                        NsdPackage.Literals.TTITLED_CLASS__TITLE_ID, true, false, false,
+                        getResourceLocator(), getString( "_UI_TitledClass_titleID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TitledClass_titleID_feature",
+                                "_UI_TitledClass_type" ),
+                        NsdPackage.Literals.TITLED_CLASS__TITLE_ID, true, false, false,
                         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) );
     }
 
     /**
-     * This returns TTitledClass.gif.
+     * This returns TitledClass.gif.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object getImage( Object object ) {
-        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TTitledClass" ) );
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TitledClass" ) );
     }
 
     /**
@@ -101,8 +101,8 @@ public class TTitledClassItemProvider extends TDocumentedClassItemProvider {
      */
     @Override
     public String getText( Object object ) {
-        TTitledClass tTitledClass = ( TTitledClass ) object;
-        return getString( "_UI_TTitledClass_type" ) + " " + tTitledClass.isDeprecated();
+        TitledClass titledClass = ( TitledClass ) object;
+        return getString( "_UI_TitledClass_type" ) + " " + titledClass.isDeprecated();
     }
 
     /**
@@ -116,8 +116,8 @@ public class TTitledClassItemProvider extends TDocumentedClassItemProvider {
     public void notifyChanged( Notification notification ) {
         updateChildren( notification );
 
-        switch( notification.getFeatureID( TTitledClass.class ) ) {
-        case NsdPackage.TTITLED_CLASS__TITLE_ID:
+        switch( notification.getFeatureID( TitledClass.class ) ) {
+        case NsdPackage.TITLED_CLASS__TITLE_ID:
             fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
             return;
         }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.aird b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.aird
new file mode 100644
index 0000000000000000000000000000000000000000..a2613245a3a6efa1a523239812a42be952110591
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.aird
@@ -0,0 +1,5047 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis uid="_p_8B4Ck6Eem-J7NZSmLltA" selectedViews="_qBT64Ck6Eem-J7NZSmLltA _qBYzYCk6Eem-J7NZSmLltA _qBYzYSk6Eem-J7NZSmLltA _qBbPoCk6Eem-J7NZSmLltA" version="14.1.0.201810161215">
+    <semanticResources>nsd.ecore</semanticResources>
+    <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
+    <semanticResources>http://www.eclipse.org/emf/2003/XMLType</semanticResources>
+    <semanticResources>nsd.genmodel</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" uid="_qBT64Ck6Eem-J7NZSmLltA">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_rQ23MCk6Eem-J7NZSmLltA" name="nsd class diagram" repPath="#_rQtGMCk6Eem-J7NZSmLltA">
+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+        <target xmi:type="ecore:EPackage" href="nsd.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_qBYzYCk6Eem-J7NZSmLltA">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_qBYzYSk6Eem-J7NZSmLltA">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_qBbPoCk6Eem-J7NZSmLltA">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram uid="_rQtGMCk6Eem-J7NZSmLltA" name="nsd class diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_rQ2QICk6Eem-J7NZSmLltA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_rQ2QISk6Eem-J7NZSmLltA">
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_sAYPoCk6Eem-J7NZSmLltA" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_sAs_wCk6Eem-J7NZSmLltA" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_sBaxcCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_sBaxcSk6Eem-J7NZSmLltA" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_sBaxcik6Eem-J7NZSmLltA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_sBdNsik6Eem-J7NZSmLltA" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_sBdNsyk6Eem-J7NZSmLltA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_sBd0wSk6Eem-J7NZSmLltA" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_sBd0wik6Eem-J7NZSmLltA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_rQ3eQCk6Eem-J7NZSmLltA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_rQ3eQSk6Eem-J7NZSmLltA" type="Sirius" element="_rQtGMCk6Eem-J7NZSmLltA" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_sCAnUCk6Eem-J7NZSmLltA" type="2003" element="_r_OZECk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCBOYCk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCBOYSk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCMNhyk6Eem-J7NZSmLltA" type="3010" element="_sAXolyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCMNiCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCMNiSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCMNiik6Eem-J7NZSmLltA" type="3010" element="_sAY2sCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCMNiyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCMNjCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCMNjSk6Eem-J7NZSmLltA" type="3010" element="_sAY2sik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCMNjik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCMNjyk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCBOYik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCBOYyk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCAnUSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCAnUik6Eem-J7NZSmLltA" x="948" y="1140"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCBOZCk6Eem-J7NZSmLltA" type="2003" element="_r_SDcCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCBOZyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCBOaCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCMNkCk6Eem-J7NZSmLltA" type="3010" element="_sAZdwCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCMNkSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCMNkik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCMNkyk6Eem-J7NZSmLltA" type="3010" element="_sAZdwik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCMNlCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCMNlSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCM0kCk6Eem-J7NZSmLltA" type="3010" element="_sAaE0Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCM0kSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCM0kik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCBOaSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCBOaik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCBOZSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCBOZik6Eem-J7NZSmLltA" x="900" y="752"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCBOayk6Eem-J7NZSmLltA" type="2003" element="_r_Sqgik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCBObik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCBObyk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCM0kyk6Eem-J7NZSmLltA" type="3010" element="_sAaE0yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCM0lCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCM0lSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCM0lik6Eem-J7NZSmLltA" type="3010" element="_sAar4Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCM0lyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCM0mCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCM0mSk6Eem-J7NZSmLltA" type="3010" element="_sAbS8Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCM0mik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCM0myk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCBOcCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCBOcSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCBObCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCBObSk6Eem-J7NZSmLltA" x="24" y="252"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCBOcik6Eem-J7NZSmLltA" type="2003" element="_r_UfsCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCBOdSk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCBOdik6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCM0nCk6Eem-J7NZSmLltA" type="3010" element="_sAbS8yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCM0nSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCM0nik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCBOdyk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCBOeCk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCBOcyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCBOdCk6Eem-J7NZSmLltA" x="1660" y="672"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCBOeSk6Eem-J7NZSmLltA" type="2003" element="_r_VGwSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCBOfCk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCB1cCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCM0nyk6Eem-J7NZSmLltA" type="3010" element="_sAb6ACk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCM0oCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCM0oSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCM0oik6Eem-J7NZSmLltA" type="3010" element="_sAb6Aik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCM0oyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCM0pCk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCB1cSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCB1cik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCBOeik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCBOeyk6Eem-J7NZSmLltA" x="2204" y="833"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCB1cyk6Eem-J7NZSmLltA" type="2003" element="_r_Vt0ik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCB1dik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCB1dyk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCB1eCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCB1eSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCB1dCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCB1dSk6Eem-J7NZSmLltA" x="2156" y="672"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCB1eik6Eem-J7NZSmLltA" type="2003" element="_r_W78Ck6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCB1fSk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCB1fik6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCM0pSk6Eem-J7NZSmLltA" type="3010" element="_sAchESk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCM0pik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCM0pyk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCB1fyk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCB1gCk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCB1eyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCB1fCk6Eem-J7NZSmLltA" x="3436" y="833"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCB1jyk6Eem-J7NZSmLltA" type="2003" element="_r_YxISk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCCcgCk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCCcgSk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCSUIyk6Eem-J7NZSmLltA" type="3010" element="_sAdIISk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCSUJCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCSUJSk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCCcgik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCCcgyk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCB1kCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCB1kSk6Eem-J7NZSmLltA" x="3343" y="680"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCCchCk6Eem-J7NZSmLltA" type="2003" element="_r_Z_QCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCCchyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCCciCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCSUJik6Eem-J7NZSmLltA" type="3010" element="_sAdvMSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCSUJyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCSUKCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCSUKSk6Eem-J7NZSmLltA" type="3010" element="_sAeWQSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCSUKik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCSUKyk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCCciSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCCciik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCCchSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCCchik6Eem-J7NZSmLltA" x="268" y="1128"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCCciyk6Eem-J7NZSmLltA" type="2003" element="_r_bNYCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCCcjik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCCcjyk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCCckCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCCckSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCCcjCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCCcjSk6Eem-J7NZSmLltA" x="1624" y="811"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCCcmSk6Eem-J7NZSmLltA" type="2003" element="_r_cbgSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCCcnCk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCCcnSk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCSULyk6Eem-J7NZSmLltA" type="3010" element="_sAe9UCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCSUMCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCSUMSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCSUMik6Eem-J7NZSmLltA" type="3010" element="_sAfkYSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCSUMyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCSUNCk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCCcnik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCCcnyk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCCcmik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCCcmyk6Eem-J7NZSmLltA" x="1107" y="824"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCCcoCk6Eem-J7NZSmLltA" type="2003" element="_r_dpoCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCDDkCk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCDDkSk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCDDkik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCDDkyk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCCcoSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCCcoik6Eem-J7NZSmLltA" x="1107" y="680"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCDDoik6Eem-J7NZSmLltA" type="2003" element="_r_fe0Ck6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCDDpSk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCDDpik6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCS7Pyk6Eem-J7NZSmLltA" type="3010" element="_sAgLcCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCS7QCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCS7QSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCS7Qik6Eem-J7NZSmLltA" type="3010" element="_sAgygCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCS7Qyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCS7RCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCS7RSk6Eem-J7NZSmLltA" type="3010" element="_sAgygik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCS7Rik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCS7Ryk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCTiQCk6Eem-J7NZSmLltA" type="3010" element="_sAhZkSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCTiQSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCTiQik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCTiQyk6Eem-J7NZSmLltA" type="3010" element="_sAhZkyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCTiRCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCTiRSk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCDDpyk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCDDqCk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCDDoyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCDDpCk6Eem-J7NZSmLltA" x="2912" y="827"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCDDqSk6Eem-J7NZSmLltA" type="2003" element="_r_gs8ik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCDDrCk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCDDrSk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCDDrik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCDDryk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCDDqik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCDDqyk6Eem-J7NZSmLltA" x="2912" y="688"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCDDsCk6Eem-J7NZSmLltA" type="2003" element="_r_h7ESk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCDqoCk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCDqoSk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCTiRik6Eem-J7NZSmLltA" type="3010" element="_sAiAoSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCTiRyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCTiSCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCTiSSk6Eem-J7NZSmLltA" type="3010" element="_sAinsCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCTiSik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCTiSyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCTiTCk6Eem-J7NZSmLltA" type="3010" element="_sAinsik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCTiTSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCTiTik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCTiTyk6Eem-J7NZSmLltA" type="3010" element="_sAintCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCTiUCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCTiUSk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCDqoik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCDqoyk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCDDsSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCDDsik6Eem-J7NZSmLltA" x="692" y="752"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCDqpCk6Eem-J7NZSmLltA" type="2003" element="_r_jJMSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCDqpyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCDqqCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCTiUik6Eem-J7NZSmLltA" type="3010" element="_sAjOwSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCTiUyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCTiVCk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCDqqSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCDqqik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCDqpSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCDqpik6Eem-J7NZSmLltA" x="2580" y="833"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCDqqyk6Eem-J7NZSmLltA" type="2003" element="_r_jwQik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCDqrik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCDqryk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCDqsCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCDqsSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCDqrCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCDqrSk6Eem-J7NZSmLltA" x="2536" y="672"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCDqsik6Eem-J7NZSmLltA" type="2003" element="_r_kXUik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCERsCk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCERsSk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCERsik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCERsyk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCDqsyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCDqtCk6Eem-J7NZSmLltA" x="916" y="32"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCERtCk6Eem-J7NZSmLltA" type="2003" element="_r_k-Yik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCERtyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCERuCk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCERuSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCERuik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCERtSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCERtik6Eem-J7NZSmLltA" x="1240" y="236"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCERuyk6Eem-J7NZSmLltA" type="2003" element="_r_mMgCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCERvik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCERvyk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCUJUCk6Eem-J7NZSmLltA" type="3010" element="_sAj10Ck6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUJUSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUJUik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUJUyk6Eem-J7NZSmLltA" type="3010" element="_sAkc4Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUJVCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUJVSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUJVik6Eem-J7NZSmLltA" type="3010" element="_sAkc4yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUJVyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUJWCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUJWSk6Eem-J7NZSmLltA" type="3010" element="_sAlD8Ck6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUJWik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUJWyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUJXCk6Eem-J7NZSmLltA" type="3010" element="_sAlD8ik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUJXSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUJXik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUJXyk6Eem-J7NZSmLltA" type="3010" element="_sAlD9Ck6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUJYCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUJYSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUJYik6Eem-J7NZSmLltA" type="3010" element="_sAlrASk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUJYyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUJZCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUJZSk6Eem-J7NZSmLltA" type="3010" element="_sAlrAyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUJZik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUJZyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwYCk6Eem-J7NZSmLltA" type="3010" element="_sAmSESk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwYSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwYik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwYyk6Eem-J7NZSmLltA" type="3010" element="_sAmSEyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwZCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwZSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwZik6Eem-J7NZSmLltA" type="3010" element="_sAm5ISk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwZyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwaCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwaSk6Eem-J7NZSmLltA" type="3010" element="_sAm5Iyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwaik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwayk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwbCk6Eem-J7NZSmLltA" type="3010" element="_sAngMSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwbSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwbik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwbyk6Eem-J7NZSmLltA" type="3010" element="_sAngMyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwcCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwcSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwcik6Eem-J7NZSmLltA" type="3010" element="_sAngNSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwcyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwdCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwdSk6Eem-J7NZSmLltA" type="3010" element="_sAoHQSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwdik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwdyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUweCk6Eem-J7NZSmLltA" type="3010" element="_sAoHQyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUweSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUweik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCERwCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCERwSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCERvCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCERvSk6Eem-J7NZSmLltA" x="3772" y="188"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCERwik6Eem-J7NZSmLltA" type="2003" element="_r_oowSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCERxSk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCERxik6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCUweyk6Eem-J7NZSmLltA" type="3010" element="_sAouUSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwfCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwfSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwfik6Eem-J7NZSmLltA" type="3010" element="_sAouUyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwfyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwgCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCUwgSk6Eem-J7NZSmLltA" type="3010" element="_sApVYSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCUwgik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCUwgyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCVXcCk6Eem-J7NZSmLltA" type="3010" element="_sApVYyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCVXcSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCVXcik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCVXcyk6Eem-J7NZSmLltA" type="3010" element="_sAp8cSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCVXdCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCVXdSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCVXdik6Eem-J7NZSmLltA" type="3010" element="_sAp8cyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCVXdyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCVXeCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCVXeSk6Eem-J7NZSmLltA" type="3010" element="_sAqjgSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCVXeik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCVXeyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCVXfCk6Eem-J7NZSmLltA" type="3010" element="_sAqjgyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCVXfSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCVXfik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCVXfyk6Eem-J7NZSmLltA" type="3010" element="_sArKkCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCVXgCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCVXgSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCVXgik6Eem-J7NZSmLltA" type="3010" element="_sArKkik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCVXgyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCVXhCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCVXhSk6Eem-J7NZSmLltA" type="3010" element="_sArKlCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCVXhik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCVXhyk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCERxyk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCERyCk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCERwyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCERxCk6Eem-J7NZSmLltA" x="2972" y="182"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCE4wCk6Eem-J7NZSmLltA" type="2003" element="_r_qd8Ck6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCE4wyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCE4xCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCVXiCk6Eem-J7NZSmLltA" type="3010" element="_sArxoSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCVXiSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCVXiik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCE4xSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCE4xik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCE4wSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCE4wik6Eem-J7NZSmLltA" x="1512" y="672"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCFf0Ck6Eem-J7NZSmLltA" type="2003" element="_r_rsEik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCFf0yk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCFf1Ck6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCV-gyk6Eem-J7NZSmLltA" type="3010" element="_sAsYsSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-hCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-hSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCV-hik6Eem-J7NZSmLltA" type="3010" element="_sAsYsyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-hyk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-iCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCV-iSk6Eem-J7NZSmLltA" type="3010" element="_sAs_wik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-iik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-iyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCV-jCk6Eem-J7NZSmLltA" type="3010" element="_sAtm0Ck6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-jSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-jik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCFf1Sk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCFf1ik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCFf0Sk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCFf0ik6Eem-J7NZSmLltA" x="596" y="1300"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCFf1yk6Eem-J7NZSmLltA" type="2003" element="_r_s6MSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCFf2ik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCFf2yk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCV-jyk6Eem-J7NZSmLltA" type="3010" element="_sAtm0ik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-kCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-kSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCV-kik6Eem-J7NZSmLltA" type="3010" element="_sAuN4Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-kyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-lCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCV-lSk6Eem-J7NZSmLltA" type="3010" element="_sAuN4yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-lik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-lyk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCFf3Ck6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCFf3Sk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCFf2Ck6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCFf2Sk6Eem-J7NZSmLltA" x="2770" y="40"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCFf3ik6Eem-J7NZSmLltA" type="2003" element="_r_thQik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCFf4Sk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCFf4ik6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCV-mCk6Eem-J7NZSmLltA" type="3010" element="_sAu08Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-mSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-mik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCV-myk6Eem-J7NZSmLltA" type="3010" element="_sAvcASk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-nCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-nSk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCFf4yk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCFf5Ck6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCFf3yk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCFf4Ck6Eem-J7NZSmLltA" x="2368" y="833"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCFf5Sk6Eem-J7NZSmLltA" type="2003" element="_r_uvYik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCGG4Ck6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCGG4Sk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCGG4ik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCGG4yk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCFf5ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCFf5yk6Eem-J7NZSmLltA" x="2332" y="672"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCGG5Ck6Eem-J7NZSmLltA" type="2003" element="_r_vWcik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCGG5yk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCGG6Ck6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCV-nik6Eem-J7NZSmLltA" type="3010" element="_sAwDECk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-nyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-oCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCV-oSk6Eem-J7NZSmLltA" type="3010" element="_sAwqICk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-oik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-oyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCV-pCk6Eem-J7NZSmLltA" type="3010" element="_sAwqIik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCV-pSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCV-pik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCGG6Sk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCGG6ik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCGG5Sk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCGG5ik6Eem-J7NZSmLltA" x="1380" y="824"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCGG6yk6Eem-J7NZSmLltA" type="2003" element="_r_xLoCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCGG7ik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCGG7yk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCGG8Ck6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCGG8Sk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCGG7Ck6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCGG7Sk6Eem-J7NZSmLltA" x="1332" y="680"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCGG8ik6Eem-J7NZSmLltA" type="2003" element="_r_xysCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCGt8Ck6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCGt8Sk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCWlkCk6Eem-J7NZSmLltA" type="3010" element="_sAxRMSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCWlkSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCWlkik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCWlkyk6Eem-J7NZSmLltA" type="3010" element="_sAx4QSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCWllCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCWllSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCWllik6Eem-J7NZSmLltA" type="3010" element="_sAyfUCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCWllyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCWlmCk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCGt8ik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCGt8yk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCGG8yk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCGG9Ck6Eem-J7NZSmLltA" x="1128" y="410"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCGuAik6Eem-J7NZSmLltA" type="2003" element="_r_zn4Sk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCHVACk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCHVASk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCWlpSk6Eem-J7NZSmLltA" type="3010" element="_sAyfUik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCWlpik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCWlpyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXMoCk6Eem-J7NZSmLltA" type="3010" element="_sAzGYSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMoSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMoik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCHVAik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCHVAyk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCGuAyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCGuBCk6Eem-J7NZSmLltA" x="2215" y="182"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCHVBCk6Eem-J7NZSmLltA" type="2003" element="_r_0O8ik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCHVByk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCHVCCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCXMoyk6Eem-J7NZSmLltA" type="3010" element="_sAztcCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMpCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMpSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXMpik6Eem-J7NZSmLltA" type="3010" element="_sAztcik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMpyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMqCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXMqSk6Eem-J7NZSmLltA" type="3010" element="_sA0UgCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMqik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMqyk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCHVCSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCHVCik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCHVBSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCHVBik6Eem-J7NZSmLltA" x="3228" y="833"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCHVCyk6Eem-J7NZSmLltA" type="2003" element="_r_1dECk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCHVDik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCHVDyk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCHVECk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCHVESk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCHVDCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCHVDSk6Eem-J7NZSmLltA" x="3159" y="696"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCHVEik6Eem-J7NZSmLltA" type="2003" element="_r_2EIik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCH8ECk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCH8ESk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCXMrCk6Eem-J7NZSmLltA" type="3010" element="_sA07kCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMrSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMrik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCH8Eik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCH8Eyk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCHVEyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCHVFCk6Eem-J7NZSmLltA" x="1340" y="416"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCH8FCk6Eem-J7NZSmLltA" type="2003" element="_r_2rMik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCH8Fyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCH8GCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCXMryk6Eem-J7NZSmLltA" type="3010" element="_sA07kik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMsCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMsSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXMsik6Eem-J7NZSmLltA" type="3010" element="_sA1ioSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMsyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMtCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXMtSk6Eem-J7NZSmLltA" type="3010" element="_sA2JsSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMtik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMtyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXMuCk6Eem-J7NZSmLltA" type="3010" element="_sA2Jsyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMuSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMuik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXMuyk6Eem-J7NZSmLltA" type="3010" element="_sA2wwSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMvCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMvSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXMvik6Eem-J7NZSmLltA" type="3010" element="_sA3X0Ck6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMvyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMwCk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCH8GSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCH8Gik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCH8FSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCH8Fik6Eem-J7NZSmLltA" x="372" y="556"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCH8Gyk6Eem-J7NZSmLltA" type="2003" element="_r_5HcCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCH8Hik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCH8Hyk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCXMwSk6Eem-J7NZSmLltA" type="3010" element="_sA3X0ik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXMwik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXMwyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXzsCk6Eem-J7NZSmLltA" type="3010" element="_sA3-4Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXzsSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXzsik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXzsyk6Eem-J7NZSmLltA" type="3010" element="_sA4l8Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXztCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXztSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXztik6Eem-J7NZSmLltA" type="3010" element="_sA4l8yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXztyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXzuCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXzuSk6Eem-J7NZSmLltA" type="3010" element="_sA5NASk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXzuik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXzuyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXzvCk6Eem-J7NZSmLltA" type="3010" element="_sA5NAyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXzvSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXzvik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCH8ICk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCH8ISk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCH8HCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCH8HSk6Eem-J7NZSmLltA" x="193" y="1292"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCH8Iik6Eem-J7NZSmLltA" type="2003" element="_r_5ugik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCIjIik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCIjIyk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCXzvyk6Eem-J7NZSmLltA" type="3010" element="_sA50ESk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXzwCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXzwSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXzwik6Eem-J7NZSmLltA" type="3010" element="_sA6bICk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXzwyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXzxCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXzxSk6Eem-J7NZSmLltA" type="3010" element="_sA6bIik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXzxik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXzxyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCXzyCk6Eem-J7NZSmLltA" type="3010" element="_sA7CMSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCXzySk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCXzyik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCIjJCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCIjJSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCIjICk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCIjISk6Eem-J7NZSmLltA" x="1968" y="824"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCIjJik6Eem-J7NZSmLltA" type="2003" element="_r_68oSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCIjKSk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCIjKik6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCIjKyk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCIjLCk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCIjJyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCIjKCk6Eem-J7NZSmLltA" x="1924" y="672"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCJKMyk6Eem-J7NZSmLltA" type="2003" element="_r_8KxCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCJKNik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCJKNyk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCZB0Ck6Eem-J7NZSmLltA" type="3010" element="_sA7pQCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZB0Sk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZB0ik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZB0yk6Eem-J7NZSmLltA" type="3010" element="_sA7pQik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZB1Ck6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZB1Sk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCJKOCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCJKOSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCJKNCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCJKNSk6Eem-J7NZSmLltA" x="3880" y="624"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCJKOik6Eem-J7NZSmLltA" type="2003" element="_r_9Y4Ck6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCJKPSk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCJKPik6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCJKPyk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCJKQCk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCJKOyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCJKPCk6Eem-J7NZSmLltA" x="3868" y="833"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCJKQSk6Eem-J7NZSmLltA" type="2003" element="_r_9_8Ck6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCJKRCk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCJKRSk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCZB1ik6Eem-J7NZSmLltA" type="3010" element="_sA8QUCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZB1yk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZB2Ck6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCJKRik6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCJKRyk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCJKQik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCJKQyk6Eem-J7NZSmLltA" x="3587" y="624"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCJxQCk6Eem-J7NZSmLltA" type="2003" element="_r_-nASk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCJxQyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCJxRCk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCJxRSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCJxRik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCJxQSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCJxQik6Eem-J7NZSmLltA" x="3612" y="833"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCJxRyk6Eem-J7NZSmLltA" type="2003" element="_r__OESk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCJxSik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCJxSyk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCZB2Sk6Eem-J7NZSmLltA" type="3010" element="_sA83YCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZB2ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZB2yk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZB3Ck6Eem-J7NZSmLltA" type="3010" element="_sA83Yik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZB3Sk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZB3ik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZB3yk6Eem-J7NZSmLltA" type="3010" element="_sA9ecSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZB4Ck6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZB4Sk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZB4ik6Eem-J7NZSmLltA" type="3010" element="_sA9ecyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZB4yk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZB5Ck6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZB5Sk6Eem-J7NZSmLltA" type="3010" element="_sA-FgSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZB5ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZB5yk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZo4Ck6Eem-J7NZSmLltA" type="3010" element="_sA-Fgyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZo4Sk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZo4ik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZo4yk6Eem-J7NZSmLltA" type="3010" element="_sA-skSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZo5Ck6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZo5Sk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZo5ik6Eem-J7NZSmLltA" type="3010" element="_sA_ToCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZo5yk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZo6Ck6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZo6Sk6Eem-J7NZSmLltA" type="3010" element="_sA_Toik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZo6ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZo6yk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCJxTCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCJxTSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCJxSCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCJxSSk6Eem-J7NZSmLltA" x="4232" y="188"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCJxTik6Eem-J7NZSmLltA" type="2003" element="_sAAcMSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCJxUSk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCJxUik6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCZo7Ck6Eem-J7NZSmLltA" type="3010" element="_sA_6sCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZo7Sk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZo7ik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZo7yk6Eem-J7NZSmLltA" type="3010" element="_sA_6sik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZo8Ck6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZo8Sk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCZo8ik6Eem-J7NZSmLltA" type="3010" element="_sBAhwCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCZo8yk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCZo9Ck6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCaP8Ck6Eem-J7NZSmLltA" type="3010" element="_sBAhwik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCaP8Sk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCaP8ik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCaP8yk6Eem-J7NZSmLltA" type="3010" element="_sBAhxCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCaP9Ck6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCaP9Sk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCaP9ik6Eem-J7NZSmLltA" type="3010" element="_sBBI0Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCaP9yk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCaP-Ck6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCJxUyk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCJxVCk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCJxTyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCJxUCk6Eem-J7NZSmLltA" x="308" y="908"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCKYUCk6Eem-J7NZSmLltA" type="2003" element="_sACRYik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCKYUyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCKYVCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCaP-Sk6Eem-J7NZSmLltA" type="3010" element="_sBBv4Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCaP-ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCaP-yk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCaP_Ck6Eem-J7NZSmLltA" type="3010" element="_sBBv4yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCaP_Sk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCaP_ik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCaP_yk6Eem-J7NZSmLltA" type="3010" element="_sBCW8Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCaQACk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCaQASk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCKYVSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCKYVik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCKYUSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCKYUik6Eem-J7NZSmLltA" x="596" y="1140"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCKYVyk6Eem-J7NZSmLltA" type="2003" element="_sADfgSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCKYWik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCKYWyk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCaQAik6Eem-J7NZSmLltA" type="3010" element="_sBCW8yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCaQAyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCaQBCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCaQBSk6Eem-J7NZSmLltA" type="3010" element="_sBC-ASk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCaQBik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCaQByk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCa3ACk6Eem-J7NZSmLltA" type="3010" element="_sBC-Ayk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCa3ASk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCa3Aik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCa3Ayk6Eem-J7NZSmLltA" type="3010" element="_sBDlESk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCa3BCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCa3BSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCa3Bik6Eem-J7NZSmLltA" type="3010" element="_sBDlEyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCa3Byk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCa3CCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCa3CSk6Eem-J7NZSmLltA" type="3010" element="_sBDlFSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCa3Cik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCa3Cyk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCKYXCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCKYXSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCKYWCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCKYWSk6Eem-J7NZSmLltA" x="2660" y="182"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCK_YCk6Eem-J7NZSmLltA" type="2003" element="_sAF7wSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCK_Yyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCK_ZCk6Eem-J7NZSmLltA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCK_ZSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCK_Zik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCK_YSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCK_Yik6Eem-J7NZSmLltA" x="2732" y="680"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCK_Zyk6Eem-J7NZSmLltA" type="2003" element="_sAGi0ik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCK_aik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCK_ayk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCbeHCk6Eem-J7NZSmLltA" type="3010" element="_sBGBUCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCbeHSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCbeHik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCbeHyk6Eem-J7NZSmLltA" type="3010" element="_sBGBUik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCbeICk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCbeISk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCbeIik6Eem-J7NZSmLltA" type="3010" element="_sBGoYSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCbeIyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCbeJCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCbeJSk6Eem-J7NZSmLltA" type="3010" element="_sBGoYyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCbeJik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCbeJyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcFICk6Eem-J7NZSmLltA" type="3010" element="_sBGoZSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcFISk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcFIik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcFIyk6Eem-J7NZSmLltA" type="3010" element="_sBHPcSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcFJCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcFJSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcFJik6Eem-J7NZSmLltA" type="3010" element="_sBHPcyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcFJyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcFKCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcFKSk6Eem-J7NZSmLltA" type="3010" element="_sBH2gSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcFKik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcFKyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcFLCk6Eem-J7NZSmLltA" type="3010" element="_sBH2gyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcFLSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcFLik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcFLyk6Eem-J7NZSmLltA" type="3010" element="_sBIdkSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcFMCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcFMSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcFMik6Eem-J7NZSmLltA" type="3010" element="_sBIdkyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcFMyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcFNCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcFNSk6Eem-J7NZSmLltA" type="3010" element="_sBJEoCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcFNik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcFNyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcsMCk6Eem-J7NZSmLltA" type="3010" element="_sBJEoik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcsMSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcsMik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCK_bCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCK_bSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCK_aCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCK_aSk6Eem-J7NZSmLltA" x="4000" y="188"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCK_bik6Eem-J7NZSmLltA" type="2003" element="_sAIYASk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCK_cSk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCLmcCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCcsMyk6Eem-J7NZSmLltA" type="3010" element="_sBJrsCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcsNCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcsNSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcsNik6Eem-J7NZSmLltA" type="3010" element="_sBJrsik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcsNyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcsOCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcsOSk6Eem-J7NZSmLltA" type="3010" element="_sBJrtCk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcsOik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcsOyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcsPCk6Eem-J7NZSmLltA" type="3010" element="_sBKSwSk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcsPSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcsPik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcsPyk6Eem-J7NZSmLltA" type="3010" element="_sBKSwyk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcsQCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcsQSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcsQik6Eem-J7NZSmLltA" type="3010" element="_sBK50Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcsQyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcsRCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCcsRSk6Eem-J7NZSmLltA" type="3010" element="_sBK50yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCcsRik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCcsRyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCdTQCk6Eem-J7NZSmLltA" type="3010" element="_sBLg4Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCdTQSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCdTQik6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCdTQyk6Eem-J7NZSmLltA" type="3010" element="_sBLg4yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCdTRCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCdTRSk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCdTRik6Eem-J7NZSmLltA" type="3010" element="_sBMH8Sk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCdTRyk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCdTSCk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCdTSSk6Eem-J7NZSmLltA" type="3010" element="_sBMH8yk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCdTSik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCdTSyk6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCLmcSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCLmcik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCK_byk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCK_cCk6Eem-J7NZSmLltA" x="3428" y="182"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCLmcyk6Eem-J7NZSmLltA" type="2003" element="_sAJmICk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCLmdik6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCLmdyk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCdTTCk6Eem-J7NZSmLltA" type="3010" element="_sBMvASk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCdTTSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCdTTik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCLmeCk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCLmeSk6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCLmdCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCLmdSk6Eem-J7NZSmLltA" x="2456" y="182"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sCMNgCk6Eem-J7NZSmLltA" type="2003" element="_sAK0QCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCMNgyk6Eem-J7NZSmLltA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sCMNhCk6Eem-J7NZSmLltA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sCdTVSk6Eem-J7NZSmLltA" type="3010" element="_sBNWECk6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCdTVik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCdTVyk6Eem-J7NZSmLltA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sCd6UCk6Eem-J7NZSmLltA" type="3010" element="_sBNWEik6Eem-J7NZSmLltA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sCd6USk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sCd6Uik6Eem-J7NZSmLltA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sCMNhSk6Eem-J7NZSmLltA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sCMNhik6Eem-J7NZSmLltA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sCMNgSk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCMNgik6Eem-J7NZSmLltA" x="456" y="16"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_rQ3eQik6Eem-J7NZSmLltA"/>
+        <edges xmi:type="notation:Edge" xmi:id="_sCehYCk6Eem-J7NZSmLltA" type="4001" element="_sBaKYCk6Eem-J7NZSmLltA" source="_sCBOayk6Eem-J7NZSmLltA" target="_sCCchCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCehZCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCehZSk6Eem-J7NZSmLltA" x="312" y="-69"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCehZik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCehZyk6Eem-J7NZSmLltA" x="175" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCehaCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCehaSk6Eem-J7NZSmLltA" x="148" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCehYSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCehYik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCehYyk6Eem-J7NZSmLltA" points="[-36, 49, -231, -827]$[-36, 875, -231, -1]$[136, 875, -59, -1]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCehaik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCfIcCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCfIcSk6Eem-J7NZSmLltA" type="4001" element="_sBaxeSk6Eem-J7NZSmLltA" source="_sCBOayk6Eem-J7NZSmLltA" target="_sCERtCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCfIdSk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfIdik6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCfIdyk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfIeCk6Eem-J7NZSmLltA" x="425" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCfIeSk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfIeik6Eem-J7NZSmLltA" x="157" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCfIcik6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCfIcyk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCfIdCk6Eem-J7NZSmLltA" points="[1, -49, -1166, -33]$[1, -77, -1166, -61]$[1165, -77, -2, -61]$[1165, -65, -2, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCfIeyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCfIfCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCfIfSk6Eem-J7NZSmLltA" type="4001" element="_sBbYhik6Eem-J7NZSmLltA" source="_sCBOayk6Eem-J7NZSmLltA" target="_sCH8FCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCfIgSk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfIgik6Eem-J7NZSmLltA" x="54" y="-102"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCfIgyk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfIhCk6Eem-J7NZSmLltA" x="3"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCfIhSk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfIhik6Eem-J7NZSmLltA" x="-7" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCfIfik6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCfIfyk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCfIgCk6Eem-J7NZSmLltA" points="[61, 98, -259, -331]$[61, 366, -259, -63]$[240, 366, -80, -63]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCfvgCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCfvgSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCfvgik6Eem-J7NZSmLltA" type="4001" element="_sBb_lik6Eem-J7NZSmLltA" source="_sCBOayk6Eem-J7NZSmLltA" target="_sCH8Gyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCfvhik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfvhyk6Eem-J7NZSmLltA" x="443" y="-97"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCfviCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfviSk6Eem-J7NZSmLltA" x="827" y="-121"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCfviik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfviyk6Eem-J7NZSmLltA" x="22" y="-137"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCfvgyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCfvhCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCfvhSk6Eem-J7NZSmLltA" points="[-80, 98, -221, -1067]$[-80, 1108, -221, -57]$[61, 1108, -80, -57]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCfvjCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCfvjSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCfvjik6Eem-J7NZSmLltA" type="4001" element="_sBcmpik6Eem-J7NZSmLltA" source="_sCBOayk6Eem-J7NZSmLltA" target="_sCJxTik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCfvkik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfvkyk6Eem-J7NZSmLltA" x="240" y="-38"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCfvlCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfvlSk6Eem-J7NZSmLltA" x="200" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCfvlik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCfvlyk6Eem-J7NZSmLltA" x="60" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCfvjyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCfvkCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCfvkSk6Eem-J7NZSmLltA" points="[16, 98, -240, -683]$[16, 718, -240, -63]$[176, 718, -80, -63]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCfvmCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCfvmSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCfvmik6Eem-J7NZSmLltA" type="4001" element="_sBdNsCk6Eem-J7NZSmLltA" source="_sCB1cyk6Eem-J7NZSmLltA" target="_sCBOeSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCgWkCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCgWkSk6Eem-J7NZSmLltA" x="18" y="-51"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCgWkik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCgWkyk6Eem-J7NZSmLltA" x="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCgWlCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCgWlSk6Eem-J7NZSmLltA" x="6" y="8"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCfvmyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCfvnCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCfvnSk6Eem-J7NZSmLltA" points="[33, 98, -15, -161]$[33, 161, -15, -98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCgWlik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCgWlyk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCgWmCk6Eem-J7NZSmLltA" type="4001" element="_sBdNuik6Eem-J7NZSmLltA" source="_sCB1jyk6Eem-J7NZSmLltA" target="_sCERwik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCgWnCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCgWnSk6Eem-J7NZSmLltA" x="58" y="-58"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCgWnik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCgWnyk6Eem-J7NZSmLltA" x="14" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCgWoCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCgWoSk6Eem-J7NZSmLltA" x="47" y="6"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCgWmSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCgWmik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCgWmyk6Eem-J7NZSmLltA" points="[-59, 1, 245, 446]$[-100, 1, 204, 446]$[-100, -313, 204, 132]$[-290, -313, 14, 132]$[-290, -342, 14, 103]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCgWoik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCgWoyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCgWpCk6Eem-J7NZSmLltA" type="4001" element="_sBd0ySk6Eem-J7NZSmLltA" source="_sCDqsik6Eem-J7NZSmLltA" target="_sCERtCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCgWqCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCgWqSk6Eem-J7NZSmLltA" x="-84" y="-8"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCgWqik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCgWqyk6Eem-J7NZSmLltA" x="109"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCgWrCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCgWrSk6Eem-J7NZSmLltA" x="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCgWpSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCgWpik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCgWpyk6Eem-J7NZSmLltA" points="[59, 73, -265, -229]$[333, 73, 9, -229]$[333, 204, 9, -98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCg9oCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCg9oSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCg9oik6Eem-J7NZSmLltA" type="4001" element="_sBeb0Ck6Eem-J7NZSmLltA" source="_sCCchCk6Eem-J7NZSmLltA" target="_sCKYUCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCg9pik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCg9pyk6Eem-J7NZSmLltA" x="1" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCg9qCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCg9qSk6Eem-J7NZSmLltA" x="1" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCg9qik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCg9qyk6Eem-J7NZSmLltA" x="-1" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCg9oyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCg9pCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCg9pSk6Eem-J7NZSmLltA" points="[60, 2, -289, -10]$[269, 2, -80, -10]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCg9rCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCg9rSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCg9rik6Eem-J7NZSmLltA" type="4001" element="_sBeb1yk6Eem-J7NZSmLltA" source="_sCCciyk6Eem-J7NZSmLltA" target="_sCBOcik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCg9sik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCg9syk6Eem-J7NZSmLltA" x="8" y="36"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCg9tCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCg9tSk6Eem-J7NZSmLltA" x="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sChksCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sChksSk6Eem-J7NZSmLltA" x="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCg9ryk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCg9sCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCg9sSk6Eem-J7NZSmLltA" points="[34, -49, -36, 90]$[34, -90, -36, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sChksik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sChksyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sChktCk6Eem-J7NZSmLltA" type="4001" element="_sBfC5ik6Eem-J7NZSmLltA" source="_sCCciyk6Eem-J7NZSmLltA" target="_sCE4wCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sChkuCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sChkuSk6Eem-J7NZSmLltA" x="-29" y="15"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sChkuik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sChkuyk6Eem-J7NZSmLltA" x="3" y="-4"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sChkvCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sChkvSk6Eem-J7NZSmLltA" x="-6" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sChktSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sChktik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sChktyk6Eem-J7NZSmLltA" points="[-39, 0, 73, 41]$[-39, -11, 73, 30]$[-112, -11, 0, 30]$[-112, -41, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sChkvik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sChkvyk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sChkwCk6Eem-J7NZSmLltA" type="4001" element="_sBfC7Sk6Eem-J7NZSmLltA" source="_sCCcoCk6Eem-J7NZSmLltA" target="_sCCcmSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sChkxCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sChkxSk6Eem-J7NZSmLltA" x="12" y="-42"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sChkxik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sChkxyk6Eem-J7NZSmLltA" x="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sChkyCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sChkySk6Eem-J7NZSmLltA" x="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sChkwSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sChkwik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sChkwyk6Eem-J7NZSmLltA" points="[-1, 98, -1, -144]$[-1, 144, -1, -98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sChkyik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sChkyyk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sChkzCk6Eem-J7NZSmLltA" type="4001" element="_sBfp9ik6Eem-J7NZSmLltA" source="_sCDDoik6Eem-J7NZSmLltA" target="_sCK_bik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCiLwCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiLwSk6Eem-J7NZSmLltA" x="279" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiLwik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiLwyk6Eem-J7NZSmLltA" x="80" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiLxCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiLxSk6Eem-J7NZSmLltA" x="71" y="-15"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sChkzSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sChkzik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sChkzyk6Eem-J7NZSmLltA" points="[47, -54, -500, 543]$[47, -417, -500, 180]$[529, -417, -18, 180]$[529, -494, -18, 103]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiLxik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiLxyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCiLyCk6Eem-J7NZSmLltA" type="4001" element="_sBgRBik6Eem-J7NZSmLltA" source="_sCDDoik6Eem-J7NZSmLltA" target="_sCERuyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCiLzCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiLzSk6Eem-J7NZSmLltA" x="291" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiLzik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiLzyk6Eem-J7NZSmLltA" x="128" y="716"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiL0Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiL0Sk6Eem-J7NZSmLltA" x="138" y="-1"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCiLySk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCiLyik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCiLyyk6Eem-J7NZSmLltA" points="[65, 0, -789, 338]$[65, -307, -789, 31]$[854, -307, 0, 31]$[854, -338, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiL0ik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiL0yk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCiL1Ck6Eem-J7NZSmLltA" type="4001" element="_sBgRDSk6Eem-J7NZSmLltA" source="_sCDDoik6Eem-J7NZSmLltA" target="_sCKYVyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCiL2Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiL2Sk6Eem-J7NZSmLltA" x="201" y="-133"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiL2ik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiL2yk6Eem-J7NZSmLltA" x="-36" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiL3Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiL3Sk6Eem-J7NZSmLltA" x="70" y="6"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCiL1Sk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCiL1ik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCiL1yk6Eem-J7NZSmLltA" points="[-95, 55, 163, 575]$[-119, 55, 139, 575]$[-119, -489, 139, 31]$[-258, -489, 0, 31]$[-258, -520, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiy0Ck6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiy0Sk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCiy0ik6Eem-J7NZSmLltA" type="4001" element="_sBg4Fik6Eem-J7NZSmLltA" source="_sCDDqSk6Eem-J7NZSmLltA" target="_sCDDoik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCiy1ik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiy1yk6Eem-J7NZSmLltA" x="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiy2Ck6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiy2Sk6Eem-J7NZSmLltA" x="24" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiy2ik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiy2yk6Eem-J7NZSmLltA" x="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCiy0yk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCiy1Ck6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCiy1Sk6Eem-J7NZSmLltA" points="[9, 49, -27, -95]$[9, 90, -27, -54]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiy3Ck6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiy3Sk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCiy3ik6Eem-J7NZSmLltA" type="4001" element="_sBhfJik6Eem-J7NZSmLltA" source="_sCDqpCk6Eem-J7NZSmLltA" target="_sCK_Zyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCiy4ik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiy4yk6Eem-J7NZSmLltA" x="705" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiy5Ck6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiy5Sk6Eem-J7NZSmLltA" x="15" y="817"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCiy5ik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCiy5yk6Eem-J7NZSmLltA" x="164" y="-6"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCiy3yk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCiy4Ck6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCiy4Sk6Eem-J7NZSmLltA" points="[16, -2, -1409, 408]$[16, -291, -1409, 119]$[1425, -291, 0, 119]$[1425, -410, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiy6Ck6Eem-J7NZSmLltA" id="(0.7166666666666667,0.03)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCiy6Sk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCiy6ik6Eem-J7NZSmLltA" type="4001" element="_sBhfLSk6Eem-J7NZSmLltA" source="_sCDqqyk6Eem-J7NZSmLltA" target="_sCDqpCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCjZ4Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCjZ4Sk6Eem-J7NZSmLltA" x="27" y="-6"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCjZ4ik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCjZ4yk6Eem-J7NZSmLltA" x="66" y="-7"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCjZ5Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCjZ5Sk6Eem-J7NZSmLltA" x="16" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCiy6yk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCiy7Ck6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCiy7Sk6Eem-J7NZSmLltA" points="[-35, 98, -79, -161]$[-35, 192, -79, -67]$[-15, 192, -59, -67]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCjZ5ik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCjZ5yk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCjZ6Ck6Eem-J7NZSmLltA" type="4001" element="_sBiGNik6Eem-J7NZSmLltA" source="_sCERtCk6Eem-J7NZSmLltA" target="_sCHVEik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCjZ7Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCjZ7Sk6Eem-J7NZSmLltA" x="60"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCjZ7ik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCjZ7yk6Eem-J7NZSmLltA" x="-4" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCjZ8Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCjZ8Sk6Eem-J7NZSmLltA" x="-26" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCjZ6Sk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCjZ6ik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCjZ6yk6Eem-J7NZSmLltA" points="[29, 49, -78, -131]$[29, 83, -78, -97]$[78, 83, -29, -97]$[78, 131, -29, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCjZ8ik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCjZ8yk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCjZ9Ck6Eem-J7NZSmLltA" type="4001" element="_sBitRik6Eem-J7NZSmLltA" source="_sCERtCk6Eem-J7NZSmLltA" target="_sCGG8ik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCjZ-Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCjZ-Sk6Eem-J7NZSmLltA" x="50" y="-8"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCjZ-ik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCjZ-yk6Eem-J7NZSmLltA" x="-5" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCjZ_Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCjZ_Sk6Eem-J7NZSmLltA" x="-31" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCjZ9Sk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCjZ9ik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCjZ9yk6Eem-J7NZSmLltA" points="[-29, 49, 68, -125]$[-29, 75, 68, -99]$[-69, 75, 28, -99]$[-69, 125, 28, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkA8Ck6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkA8Sk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCkA8ik6Eem-J7NZSmLltA" type="4001" element="_sBitTSk6Eem-J7NZSmLltA" source="_sCFf3ik6Eem-J7NZSmLltA" target="_sCGuAik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCkA9ik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkA9yk6Eem-J7NZSmLltA" x="100" y="-80"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkA-Ck6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkA-Sk6Eem-J7NZSmLltA" x="103" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkA-ik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkA-yk6Eem-J7NZSmLltA" x="-31" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCkA8yk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCkA9Ck6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCkA9Sk6Eem-J7NZSmLltA" points="[36, -49, 190, 602]$[36, -510, 190, 141]$[-153, -510, 1, 141]$[-153, -602, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkA_Ck6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkA_Sk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCkA_ik6Eem-J7NZSmLltA" type="4001" element="_sBjUVik6Eem-J7NZSmLltA" source="_sCFf5Sk6Eem-J7NZSmLltA" target="_sCFf3ik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCkBAik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkBAyk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkBBCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkBBSk6Eem-J7NZSmLltA" x="1" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkBBik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkBByk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCkA_yk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCkBACk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCkBASk6Eem-J7NZSmLltA" points="[59, 129, 22, -32]$[-23, 129, -60, -32]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkBCCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkBCSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCkBCik6Eem-J7NZSmLltA" type="4001" element="_sBj7Yyk6Eem-J7NZSmLltA" source="_sCGG5Ck6Eem-J7NZSmLltA" target="_sCCciyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCkoACk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkoASk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkoAik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkoAyk6Eem-J7NZSmLltA" x="23" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkoBCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkoBSk6Eem-J7NZSmLltA" x="-86" y="-1"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCkBCyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCkBDCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCkBDSk6Eem-J7NZSmLltA" points="[61, -14, -182, -1]$[184, -14, -59, -1]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkoBik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkoByk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCkoCCk6Eem-J7NZSmLltA" type="4001" element="_sBj7aik6Eem-J7NZSmLltA" source="_sCGG6yk6Eem-J7NZSmLltA" target="_sCGG5Ck6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCkoDCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkoDSk6Eem-J7NZSmLltA" x="8" y="-68"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkoDik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkoDyk6Eem-J7NZSmLltA" x="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkoECk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkoESk6Eem-J7NZSmLltA" x="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCkoCSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCkoCik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCkoCyk6Eem-J7NZSmLltA" points="[21, 49, -28, -95]$[21, 95, -28, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkoEik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCkoEyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCkoFCk6Eem-J7NZSmLltA" type="4001" element="_sBkidik6Eem-J7NZSmLltA" source="_sCHVCyk6Eem-J7NZSmLltA" target="_sCB1eik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCkoGCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkoGSk6Eem-J7NZSmLltA" x="35" y="12"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkoGik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkoGyk6Eem-J7NZSmLltA" x="25" y="2"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCkoHCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCkoHSk6Eem-J7NZSmLltA" x="-60" y="-3"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCkoFSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCkoFik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCkoFyk6Eem-J7NZSmLltA" points="[34, 98, -243, -137]$[34, 115, -243, -120]$[242, 115, -35, -120]$[242, 137, -35, -98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sClPECk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sClPESk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sClPEik6Eem-J7NZSmLltA" type="4001" element="_sBkifSk6Eem-J7NZSmLltA" source="_sCHVCyk6Eem-J7NZSmLltA" target="_sCHVBCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sClPFik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sClPFyk6Eem-J7NZSmLltA" x="-33" y="12"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sClPGCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sClPGSk6Eem-J7NZSmLltA" x="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sClPGik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sClPGyk6Eem-J7NZSmLltA" x="-42" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sClPEyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sClPFCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sClPFSk6Eem-J7NZSmLltA" points="[-26, 49, -110, -88]$[-26, 75, -110, -62]$[46, 75, -38, -62]$[46, 88, -38, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sClPHCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sClPHSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sClPHik6Eem-J7NZSmLltA" type="4001" element="_sBlJhik6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCDDsCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sClPIik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sClPIyk6Eem-J7NZSmLltA" x="98" y="71"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sClPJCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sClPJSk6Eem-J7NZSmLltA" x="4" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sClPJik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sClPJyk6Eem-J7NZSmLltA" x="-29" y="71"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sClPHyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sClPICk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sClPISk6Eem-J7NZSmLltA" points="[80, 54, -219, -129]$[275, 54, -24, -129]$[275, 134, -24, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sClPKCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sClPKSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sClPKik6Eem-J7NZSmLltA" type="4001" element="_sBlwkyk6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCBOZCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCl2Iyk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCl2JCk6Eem-J7NZSmLltA" x="109" y="77"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCl2JSk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCl2Jik6Eem-J7NZSmLltA" x="-2" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCl2Jyk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCl2KCk6Eem-J7NZSmLltA" x="-8" y="14"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCl2ICk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCl2ISk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCl2Iik6Eem-J7NZSmLltA" points="[80, 42, -448, -141]$[480, 42, -48, -141]$[480, 134, -48, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCl2KSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCl2Kik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCl2Kyk6Eem-J7NZSmLltA" type="4001" element="_sBlwmik6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCCcoCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCl2Lyk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCl2MCk6Eem-J7NZSmLltA" x="242" y="20"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCl2MSk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCl2Mik6Eem-J7NZSmLltA" x="340" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCl2Myk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCl2NCk6Eem-J7NZSmLltA" x="64" y="21"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCl2LCk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCl2LSk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCl2Lik6Eem-J7NZSmLltA" points="[80, 30, -634, -81]$[685, 30, -29, -81]$[685, 62, -29, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCl2NSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCl2Nik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCl2Nyk6Eem-J7NZSmLltA" type="4001" element="_sBmXoCk6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCGG6yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCmdMCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCmdMSk6Eem-J7NZSmLltA" x="469" y="28"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCmdMik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCmdMyk6Eem-J7NZSmLltA" x="656" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCmdNCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCmdNSk6Eem-J7NZSmLltA" x="68" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCl2OCk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCl2OSk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCl2Oik6Eem-J7NZSmLltA" points="[80, 22, -859, -89]$[924, 22, -15, -89]$[924, 62, -15, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCmdNik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCmdNyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCmdOCk6Eem-J7NZSmLltA" type="4001" element="_sBmXpyk6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCIjJik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCmdPCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCmdPSk6Eem-J7NZSmLltA" x="639" y="25"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCmdPik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCmdPyk6Eem-J7NZSmLltA" x="1100" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCmdQCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCmdQSk6Eem-J7NZSmLltA" x="45" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCmdOSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCmdOik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCmdOyk6Eem-J7NZSmLltA" points="[80, 10, -1451, -93]$[1520, 10, -11, -93]$[1520, 54, -11, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCmdQik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCmdQyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCmdRCk6Eem-J7NZSmLltA" type="4001" element="_sBm-tik6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCB1cyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCmdSCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCmdSSk6Eem-J7NZSmLltA" x="764" y="39"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCmdSik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCmdSyk6Eem-J7NZSmLltA" x="1318" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCmdTCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCmdTSk6Eem-J7NZSmLltA" x="143" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCmdRSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCmdRik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCmdRyk6Eem-J7NZSmLltA" points="[80, 0, -1683, -103]$[1764, 0, 1, -103]$[1764, 54, 1, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCmdTik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnEQCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCnEQSk6Eem-J7NZSmLltA" type="4001" element="_sBnlxik6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCFf5Sk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCnERSk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnERik6Eem-J7NZSmLltA" x="839" y="49"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnERyk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnESCk6Eem-J7NZSmLltA" x="895" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnESSk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnESik6Eem-J7NZSmLltA" x="232" y="44"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCnEQik6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCnEQyk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCnERCk6Eem-J7NZSmLltA" points="[80, -10, -1859, -113]$[1920, -10, -19, -113]$[1920, 54, -19, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnESyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnETCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCnETSk6Eem-J7NZSmLltA" type="4001" element="_sBnlzSk6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCDqqyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCnEUSk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnEUik6Eem-J7NZSmLltA" x="926" y="61"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnEUyk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnEVCk6Eem-J7NZSmLltA" x="313" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnEVSk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnEVik6Eem-J7NZSmLltA" x="27" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCnETik6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCnETyk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCnEUCk6Eem-J7NZSmLltA" points="[80, -22, -2063, -125]$[2120, -22, -23, -125]$[2120, 54, -23, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnEVyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnEWCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCnEWSk6Eem-J7NZSmLltA" type="4001" element="_sBoM1ik6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCDDqSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCnEXSk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnEXik6Eem-J7NZSmLltA" x="1188" y="89"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnEXyk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnEYCk6Eem-J7NZSmLltA" x="1701" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnEYSk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnEYik6Eem-J7NZSmLltA" x="7" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCnEWik6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCnEWyk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCnEXCk6Eem-J7NZSmLltA" points="[80, -34, -2439, -153]$[2478, -34, -41, -153]$[2478, 70, -41, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnrUCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnrUSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCnrUik6Eem-J7NZSmLltA" type="4001" element="_sBoz5ik6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCHVCyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCnrVik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnrVyk6Eem-J7NZSmLltA" x="1314" y="105"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnrWCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnrWSk6Eem-J7NZSmLltA" x="1761" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnrWik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnrWyk6Eem-J7NZSmLltA" x="14" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCnrUyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCnrVCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCnrVSk6Eem-J7NZSmLltA" points="[80, -46, -2686, -173]$[2736, -46, -30, -173]$[2736, 78, -30, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnrXCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnrXSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCnrXik6Eem-J7NZSmLltA" type="4001" element="_sBpa8Ck6Eem-J7NZSmLltA" source="_sCH8Gyk6Eem-J7NZSmLltA" target="_sCFf0Ck6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCnrYik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnrYyk6Eem-J7NZSmLltA" x="21" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnrZCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnrZSk6Eem-J7NZSmLltA" x="122" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnrZik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnrZyk6Eem-J7NZSmLltA" x="6" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCnrXyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCnrYCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCnrYSk6Eem-J7NZSmLltA" points="[80, 56, -311, -50]$[323, 56, -68, -50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnraCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCnraSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCnraik6Eem-J7NZSmLltA" type="4001" element="_sBpa9yk6Eem-J7NZSmLltA" source="_sCIjJik6Eem-J7NZSmLltA" target="_sCH8Iik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCnrbik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnrbyk6Eem-J7NZSmLltA" x="19" y="-66"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnrcCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnrcSk6Eem-J7NZSmLltA" x="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCnrcik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCnrcyk6Eem-J7NZSmLltA" x="7"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCnrayk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCnrbCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCnrbSk6Eem-J7NZSmLltA" points="[44, 98, 0, -152]$[44, 152, 0, -98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCoSYCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCoSYSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCoSYik6Eem-J7NZSmLltA" type="4001" element="_sBqCBik6Eem-J7NZSmLltA" source="_sCJKMyk6Eem-J7NZSmLltA" target="_sCJxRyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCoSZik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCoSZyk6Eem-J7NZSmLltA" x="-165" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCoSaCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCoSaSk6Eem-J7NZSmLltA" x="152" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCoSaik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCoSayk6Eem-J7NZSmLltA" x="-113" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCoSYyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCoSZCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCoSZSk6Eem-J7NZSmLltA" points="[59, 7, -360, 406]$[439, 7, 20, 406]$[439, -312, 20, 87]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCoSbCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCoSbSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCoSbik6Eem-J7NZSmLltA" type="4001" element="_sBqpFik6Eem-J7NZSmLltA" source="_sCJKOik6Eem-J7NZSmLltA" target="_sCJKMyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCoScik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCoScyk6Eem-J7NZSmLltA" x="41" y="44"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCoSdCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCoSdSk6Eem-J7NZSmLltA" x="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCoSdik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCoSdyk6Eem-J7NZSmLltA" x="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCoSbyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCoScCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCoScSk6Eem-J7NZSmLltA" points="[12, 0, 0, 111]$[12, -111, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCoSeCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCoSeSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCoSeik6Eem-J7NZSmLltA" type="4001" element="_sBrQIyk6Eem-J7NZSmLltA" source="_sCJxQCk6Eem-J7NZSmLltA" target="_sCJKQSk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCoSfik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCoSfyk6Eem-J7NZSmLltA" x="41" y="-73"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCoSgCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCoSgSk6Eem-J7NZSmLltA" x="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCoSgik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCoSgyk6Eem-J7NZSmLltA" x="-11" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCoSeyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCoSfCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCoSfSk6Eem-J7NZSmLltA" points="[-25, -49, -26, 160]$[-25, -160, -26, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCo5cCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCo5cSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCo5cik6Eem-J7NZSmLltA" type="4001" element="_sBrQKik6Eem-J7NZSmLltA" source="_sCJxTik6Eem-J7NZSmLltA" target="_sCDDsCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCo5dik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCo5dyk6Eem-J7NZSmLltA" x="133" y="-7"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCo5eCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCo5eSk6Eem-J7NZSmLltA" x="76" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCo5eik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCo5eyk6Eem-J7NZSmLltA" x="-31" y="-9"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCo5cyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCo5dCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCo5dSk6Eem-J7NZSmLltA" points="[80, -50, -283, 119]$[339, -50, -24, 119]$[339, -120, -24, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCo5fCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCo5fSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCo5fik6Eem-J7NZSmLltA" type="4001" element="_sBr3Nik6Eem-J7NZSmLltA" source="_sCJxTik6Eem-J7NZSmLltA" target="_sCGG6yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCo5gik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCo5gyk6Eem-J7NZSmLltA" x="299" y="-141"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCo5hCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCo5hSk6Eem-J7NZSmLltA" x="224" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCo5hik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCo5hyk6Eem-J7NZSmLltA" x="-118" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCo5fyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCo5gCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCo5gSk6Eem-J7NZSmLltA" points="[80, -38, -923, 203]$[964, -38, -39, 203]$[964, -192, -39, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCo5iCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCo5iSk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCo5iik6Eem-J7NZSmLltA" type="4001" element="_sBseQCk6Eem-J7NZSmLltA" source="_sCJxTik6Eem-J7NZSmLltA" target="_sCIjJik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCpggCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCpggSk6Eem-J7NZSmLltA" x="587" y="-163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCpggik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCpggyk6Eem-J7NZSmLltA" x="1152" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCpghCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCpghSk6Eem-J7NZSmLltA" x="9" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCo5iyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCo5jCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCo5jSk6Eem-J7NZSmLltA" points="[80, -22, -1515, 227]$[1552, -22, -43, 227]$[1552, -200, -43, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCpghik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCpghyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCpgiCk6Eem-J7NZSmLltA" type="4001" element="_sBseRyk6Eem-J7NZSmLltA" source="_sCJxTik6Eem-J7NZSmLltA" target="_sCB1cyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCpgjCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCpgjSk6Eem-J7NZSmLltA" x="704" y="-175"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCpgjik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCpgjyk6Eem-J7NZSmLltA" x="386" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCpgkCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCpgkSk6Eem-J7NZSmLltA" x="8" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCpgiSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCpgiik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCpgiyk6Eem-J7NZSmLltA" points="[80, -10, -1747, 239]$[1780, -10, -47, 239]$[1780, -200, -47, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCpgkik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCpgkyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCpglCk6Eem-J7NZSmLltA" type="4001" element="_sBtFVik6Eem-J7NZSmLltA" source="_sCJxTik6Eem-J7NZSmLltA" target="_sCK_YCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCpgmCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCpgmSk6Eem-J7NZSmLltA" x="1007" y="2"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCpgmik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCpgmyk6Eem-J7NZSmLltA" x="365" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCpgnCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCpgnSk6Eem-J7NZSmLltA" x="93" y="-5"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCpglSk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCpglik6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCpglyk6Eem-J7NZSmLltA" points="[80, 0, -2323, 241]$[2368, 0, -35, 241]$[2368, -192, -35, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCpgnik6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCqHkCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCqHkSk6Eem-J7NZSmLltA" type="4001" element="_sBtsZik6Eem-J7NZSmLltA" source="_sCJxTik6Eem-J7NZSmLltA" target="_sCJxQCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCqHlSk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqHlik6Eem-J7NZSmLltA" x="1628" y="-56"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCqHlyk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqHmCk6Eem-J7NZSmLltA" x="-84" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCqHmSk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqHmik6Eem-J7NZSmLltA" x="-605" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCqHkik6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCqHkyk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCqHlCk6Eem-J7NZSmLltA" points="[80, 97, -3213, 74]$[3252, 97, -41, 74]$[3252, 23, -41, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCqHmyk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCqHnCk6Eem-J7NZSmLltA" id="(0.49645390070921985,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCqHnSk6Eem-J7NZSmLltA" type="4001" element="_sBtsbSk6Eem-J7NZSmLltA" source="_sCJxTik6Eem-J7NZSmLltA" target="_sCJKOik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCqHoSk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqHoik6Eem-J7NZSmLltA" x="1733" y="-83"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCqHoyk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqHpCk6Eem-J7NZSmLltA" x="2735" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCqHpSk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqHpik6Eem-J7NZSmLltA" x="-137" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCqHnik6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCqHnyk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCqHoCk6Eem-J7NZSmLltA" points="[80, 62, -3459, 150]$[3540, 62, 1, 150]$[3540, -39, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCqHpyk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCqHqCk6Eem-J7NZSmLltA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCqHqSk6Eem-J7NZSmLltA" type="4001" element="_sBuTdik6Eem-J7NZSmLltA" source="_sCKYUCk6Eem-J7NZSmLltA" target="_sCAnUCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCqHrSk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqHrik6Eem-J7NZSmLltA" x="-2" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCqHryk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqHsCk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCqHsSk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqHsik6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCqHqik6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCqHqyk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCqHrCk6Eem-J7NZSmLltA" points="[80, 48, -272, -50]$[272, 48, -80, -50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCquoCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCquoSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCquoik6Eem-J7NZSmLltA" type="4001" element="_sBu6hik6Eem-J7NZSmLltA" source="_sCK_YCk6Eem-J7NZSmLltA" target="_sCDqpCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCqupik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqupyk6Eem-J7NZSmLltA" x="10" y="14"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCquqCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCquqSk6Eem-J7NZSmLltA" x="55" y="3"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCquqik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCquqyk6Eem-J7NZSmLltA" x="-41" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCquoyk6Eem-J7NZSmLltA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCqupCk6Eem-J7NZSmLltA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCqupSk6Eem-J7NZSmLltA" points="[0, 98, 152, -153]$[0, 191, 152, -60]$[-93, 191, 59, -60]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCqurCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCqurSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCqurik6Eem-J7NZSmLltA" type="4001" element="_sBzL8Ck6Eem-J7NZSmLltA" source="_sCAnUCk6Eem-J7NZSmLltA" target="_sCMNgCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCqusik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqusyk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCqutCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqutSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCqutik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCqutyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCquryk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCqusCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCqusSk6Eem-J7NZSmLltA" points="[0, 0, 457, 60]$[-457, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCquuCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCquuSk6Eem-J7NZSmLltA" id="(0.4968944099378882,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCquuik6Eem-J7NZSmLltA" type="4001" element="_sBzzBik6Eem-J7NZSmLltA" source="_sCBOZCk6Eem-J7NZSmLltA" target="_sCMNgCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCrVsCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCrVsSk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCrVsik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCrVsyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCrVtCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCrVtSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCquuyk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCquvCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCquvSk6Eem-J7NZSmLltA" points="[0, 0, -517, 60]$[517, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCrVtik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCrVtyk6Eem-J7NZSmLltA" id="(0.4968944099378882,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCrVuCk6Eem-J7NZSmLltA" type="4001" element="_sB0aEyk6Eem-J7NZSmLltA" source="_sCB1eik6Eem-J7NZSmLltA" target="_sCB1jyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCrVvCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCrVvSk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCrVvik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCrVvyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCrVwCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCrVwSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCrVuSk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCrVuik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCrVuyk6Eem-J7NZSmLltA" points="[0, 0, 1, 60]$[-1, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCrVwik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCrVwyk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCrVxCk6Eem-J7NZSmLltA" type="4001" element="_sB0aGik6Eem-J7NZSmLltA" source="_sCB1jyk6Eem-J7NZSmLltA" target="_sCLmcyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCr8wCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCr8wSk6Eem-J7NZSmLltA" x="-49" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCr8wik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCr8wyk6Eem-J7NZSmLltA" x="-19" y="-32"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCr8xCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCr8xSk6Eem-J7NZSmLltA" x="-13" y="27"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCrVxSk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCrVxik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCrVxyk6Eem-J7NZSmLltA" points="[0, 0, 887, 400]$[0, -184, 887, 216]$[-886, -184, 1, 216]$[-886, -400, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCr8xik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCr8xyk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCr8yCk6Eem-J7NZSmLltA" type="4001" element="_sB0aISk6Eem-J7NZSmLltA" source="_sCCchCk6Eem-J7NZSmLltA" target="_sCDqsik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCr8zCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCr8zSk6Eem-J7NZSmLltA" x="49" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCr8zik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCr8zyk6Eem-J7NZSmLltA" x="15" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCr80Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCr80Sk6Eem-J7NZSmLltA" x="11" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCr8ySk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCr8yik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCr8yyk6Eem-J7NZSmLltA" points="[0, 0, -148, 714]$[0, -692, -148, 22]$[149, -692, 1, 22]$[149, -714, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCr80ik6Eem-J7NZSmLltA" id="(0.12396694214876033,0.01)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCr80yk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCr81Ck6Eem-J7NZSmLltA" type="4001" element="_sB1BJik6Eem-J7NZSmLltA" source="_sCDDoik6Eem-J7NZSmLltA" target="_sCLmcyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCr82Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCr82Sk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCr82ik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCr82yk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCr83Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCr83Sk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCr81Sk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCr81ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCr81yk6Eem-J7NZSmLltA" points="[0, 0, 650, 409]$[0, -243, 650, 166]$[-649, -243, 1, 166]$[-649, -409, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCr83ik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCr83yk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCr84Ck6Eem-J7NZSmLltA" type="4001" element="_sB1BLSk6Eem-J7NZSmLltA" source="_sCDDsCk6Eem-J7NZSmLltA" target="_sCMNgCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCsj0Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCsj0Sk6Eem-J7NZSmLltA" x="1" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCsj0ik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCsj0yk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCsj1Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCsj1Sk6Eem-J7NZSmLltA" x="-21" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCr84Sk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCr84ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCr84yk6Eem-J7NZSmLltA" points="[0, 0, 216, 630]$[0, -596, 216, 34]$[-216, -596, 0, 34]$[-216, -630, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCsj1ik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCsj1yk6Eem-J7NZSmLltA" id="(0.4968944099378882,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCsj2Ck6Eem-J7NZSmLltA" type="4001" element="_sB1BNCk6Eem-J7NZSmLltA" source="_sCDqpCk6Eem-J7NZSmLltA" target="_sCLmcyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCsj3Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCsj3Sk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCsj3ik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCsj3yk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCsj4Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCsj4Sk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCsj2Sk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCsj2ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCsj2yk6Eem-J7NZSmLltA" points="[0, 0, -880, 363]$[0, -197, -880, 166]$[881, -197, 1, 166]$[881, -363, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCsj4ik6Eem-J7NZSmLltA" id="(0.6833333333333333,0.02)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCsj4yk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCsj5Ck6Eem-J7NZSmLltA" type="4001" element="_sB1oNik6Eem-J7NZSmLltA" source="_sCERuyk6Eem-J7NZSmLltA" target="_sCFf1yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCsj6Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCsj6Sk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtK4Ck6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtK4Sk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtK4ik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtK4yk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCsj5Sk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCsj5ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCsj5yk6Eem-J7NZSmLltA" points="[0, 0, 277, 60]$[-277, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtK5Ck6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtK5Sk6Eem-J7NZSmLltA" id="(0.496551724137931,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCtK5ik6Eem-J7NZSmLltA" type="4001" element="_sB1oPSk6Eem-J7NZSmLltA" source="_sCERwik6Eem-J7NZSmLltA" target="_sCFf1yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCtK6ik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtK6yk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtK7Ck6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtK7Sk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtK7ik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtK7yk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCtK5yk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCtK6Ck6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCtK6Sk6Eem-J7NZSmLltA" points="[0, 0, -914, 60]$[914, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtK8Ck6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtK8Sk6Eem-J7NZSmLltA" id="(0.496551724137931,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCtK8ik6Eem-J7NZSmLltA" type="4001" element="_sB1oRCk6Eem-J7NZSmLltA" source="_sCFf3ik6Eem-J7NZSmLltA" target="_sCLmcyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCtK9ik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtK9yk6Eem-J7NZSmLltA" x="-148" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtK-Ck6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtK-Sk6Eem-J7NZSmLltA" x="-11" y="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtK-ik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtK-yk6Eem-J7NZSmLltA" x="-148" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCtK8yk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCtK9Ck6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCtK9Sk6Eem-J7NZSmLltA" points="[0, 0, -1091, 363]$[0, -197, -1091, 166]$[1092, -197, 1, 166]$[1092, -363, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtK_Ck6Eem-J7NZSmLltA" id="(0.4959349593495935,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtK_Sk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCtK_ik6Eem-J7NZSmLltA" type="4001" element="_sB2PQyk6Eem-J7NZSmLltA" source="_sCGuAik6Eem-J7NZSmLltA" target="_sCFf1yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCtx8Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtx8Sk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtx8ik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtx8yk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtx9Ck6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtx9Sk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCtK_yk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCtLACk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCtLASk6Eem-J7NZSmLltA" points="[0, 0, -667, 60]$[667, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtx9ik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtx9yk6Eem-J7NZSmLltA" id="(0.496551724137931,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCtx-Ck6Eem-J7NZSmLltA" type="4001" element="_sB2PSik6Eem-J7NZSmLltA" source="_sCHVBCk6Eem-J7NZSmLltA" target="_sCB1jyk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCtx_Ck6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtx_Sk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtx_ik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtx_yk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtyACk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtyASk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCtx-Sk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCtx-ik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCtx-yk6Eem-J7NZSmLltA" points="[0, 0, -195, 60]$[195, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtyAik6Eem-J7NZSmLltA" id="(0.4966887417218543,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtyAyk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCtyBCk6Eem-J7NZSmLltA" type="4001" element="_sB2PUSk6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCDqsik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCtyCCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtyCSk6Eem-J7NZSmLltA" x="-47" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtyCik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtyCyk6Eem-J7NZSmLltA" x="14" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtyDCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtyDSk6Eem-J7NZSmLltA" x="-13" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCtyBSk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCtyBik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCtyByk6Eem-J7NZSmLltA" points="[0, 0, -523, 426]$[0, -380, -523, 46]$[524, -380, 1, 46]$[524, -426, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtyDik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCtyDyk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCtyECk6Eem-J7NZSmLltA" type="4001" element="_sB2PWCk6Eem-J7NZSmLltA" source="_sCH8FCk6Eem-J7NZSmLltA" target="_sCMNgCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCtyFCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtyFSk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtyFik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtyFyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCtyGCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCtyGSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCtyESk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCtyEik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCtyEyk6Eem-J7NZSmLltA" points="[0, 0, -733, 380]$[140, -61, -593, 319]$[142, -160, -591, 220]$[341, -221, -392, 159]$[343, -320, -390, 60]$[733, -380, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCuZACk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCuZASk6Eem-J7NZSmLltA" id="(0.4968944099378882,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCuZAik6Eem-J7NZSmLltA" type="4001" element="_sB22Vik6Eem-J7NZSmLltA" source="_sCH8Gyk6Eem-J7NZSmLltA" target="_sCDqsik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCuZBik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCuZByk6Eem-J7NZSmLltA" x="157" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCuZCCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCuZCSk6Eem-J7NZSmLltA" x="45" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCuZCik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCuZCyk6Eem-J7NZSmLltA" x="58" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCuZAyk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCuZBCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCuZBSk6Eem-J7NZSmLltA" points="[0, 0, -768, 1260]$[0, -1116, -768, 144]$[735, -1116, -33, 144]$[735, -1162, -33, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCuZDCk6Eem-J7NZSmLltA" id="(0.29012345679012347,0.007874015748031496)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCuZDSk6Eem-J7NZSmLltA" id="(0.775,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCuZDik6Eem-J7NZSmLltA" type="4001" element="_sB22XSk6Eem-J7NZSmLltA" source="_sCH8Gyk6Eem-J7NZSmLltA" target="_sCMNgCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCuZEik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCuZEyk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCuZFCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCuZFSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCuZFik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCuZFyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCuZDyk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCuZECk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCuZESk6Eem-J7NZSmLltA" points="[0, 0, -232, 958]$[0, -920, -232, 38]$[232, -920, 0, 38]$[232, -958, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCuZGCk6Eem-J7NZSmLltA" id="(0.11111111111111112,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCuZGSk6Eem-J7NZSmLltA" id="(0.4968944099378882,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCuZGik6Eem-J7NZSmLltA" type="4001" element="_sB22ZCk6Eem-J7NZSmLltA" source="_sCJKQSk6Eem-J7NZSmLltA" target="_sCDqpCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCuZHik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCuZHyk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvAECk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvAESk6Eem-J7NZSmLltA" x="-33" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvAEik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvAEyk6Eem-J7NZSmLltA" x="-79" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCuZGyk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCuZHCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCuZHSk6Eem-J7NZSmLltA" points="[0, 98, 1043, -209]$[0, 436, 1043, 129]$[-1042, 436, 1, 129]$[-1042, 307, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvAFCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvAFSk6Eem-J7NZSmLltA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCvAFik6Eem-J7NZSmLltA" type="4001" element="_sB3dZik6Eem-J7NZSmLltA" source="_sCJxRyk6Eem-J7NZSmLltA" target="_sCFf1yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCvAGik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvAGyk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvAHCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvAHSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvAHik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvAHyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCvAFyk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCvAGCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCvAGSk6Eem-J7NZSmLltA" points="[0, 0, 1590, 60]$[-1590, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvAICk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvAISk6Eem-J7NZSmLltA" id="(0.496551724137931,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCvAIik6Eem-J7NZSmLltA" type="4001" element="_sB3dbSk6Eem-J7NZSmLltA" source="_sCJxTik6Eem-J7NZSmLltA" target="_sCDqsik6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCvAJik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvAJyk6Eem-J7NZSmLltA" x="-48" y="69"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvAKCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvAKSk6Eem-J7NZSmLltA" x="2" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvAKik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvAKyk6Eem-J7NZSmLltA" x="-45" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCvAIyk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCvAJCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCvAJSk6Eem-J7NZSmLltA" points="[0, -2, -676, 796]$[0, -734, -676, 64]$[622, -734, -54, 64]$[622, -780, -54, 18]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvALCk6Eem-J7NZSmLltA" id="(0.2777777777777778,0.023622047244094488)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvALSk6Eem-J7NZSmLltA" id="(0.95,0.82)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCvnICk6Eem-J7NZSmLltA" type="4001" element="_sB3ddCk6Eem-J7NZSmLltA" source="_sCJxTik6Eem-J7NZSmLltA" target="_sCMNgCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCvnJCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvnJSk6Eem-J7NZSmLltA" x="-55" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvnJik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvnJyk6Eem-J7NZSmLltA" x="82" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvnKCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvnKSk6Eem-J7NZSmLltA" x="-57" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCvnISk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCvnIik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCvnIyk6Eem-J7NZSmLltA" points="[0, 0, -461, 366]$[0, -316, -461, 50]$[461, -316, 0, 50]$[461, -366, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvnKik6Eem-J7NZSmLltA" id="(0.11728395061728394,0.015748031496062992)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvnKyk6Eem-J7NZSmLltA" id="(0.4968944099378882,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCvnLCk6Eem-J7NZSmLltA" type="4001" element="_sB4Edik6Eem-J7NZSmLltA" source="_sCKYUCk6Eem-J7NZSmLltA" target="_sCMNgCk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCvnMCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvnMSk6Eem-J7NZSmLltA" x="2" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvnMik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvnMyk6Eem-J7NZSmLltA" x="3" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvnNCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvnNSk6Eem-J7NZSmLltA" x="-15" y="-23"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCvnLSk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCvnLik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCvnLyk6Eem-J7NZSmLltA" points="[0, 0, 123, 1019]$[0, -984, 123, 35]$[-141, -984, -18, 35]$[-141, -1018, -18, 1]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvnNik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCvnNyk6Eem-J7NZSmLltA" id="(0.6149068322981367,0.99)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCvnOCk6Eem-J7NZSmLltA" type="4001" element="_sB4EfSk6Eem-J7NZSmLltA" source="_sCKYVyk6Eem-J7NZSmLltA" target="_sCFf1yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCvnPCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvnPSk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvnPik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvnPyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCvnQCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCvnQSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCvnOSk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCvnOik6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCvnOyk6Eem-J7NZSmLltA" points="[0, 0, -277, 60]$[277, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCwOMCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCwOMSk6Eem-J7NZSmLltA" id="(0.496551724137931,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCwOMik6Eem-J7NZSmLltA" type="4001" element="_sB4EhCk6Eem-J7NZSmLltA" source="_sCK_Zyk6Eem-J7NZSmLltA" target="_sCFf1yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCwONik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCwONyk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCwOOCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCwOOSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCwOOik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCwOOyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCwOMyk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCwONCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCwONSk6Eem-J7NZSmLltA" points="[0, 0, 517, 60]$[-517, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCwOPCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCwOPSk6Eem-J7NZSmLltA" id="(0.496551724137931,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCwOPik6Eem-J7NZSmLltA" type="4001" element="_sB4rgyk6Eem-J7NZSmLltA" source="_sCK_bik6Eem-J7NZSmLltA" target="_sCFf1yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCwOQik6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCwOQyk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCwORCk6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCwORSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCwORik6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCwORyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCwOPyk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCwOQCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCwOQSk6Eem-J7NZSmLltA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCwOSCk6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCwOSSk6Eem-J7NZSmLltA" id="(0.496551724137931,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_sCwOSik6Eem-J7NZSmLltA" type="4001" element="_sB4riik6Eem-J7NZSmLltA" source="_sCLmcyk6Eem-J7NZSmLltA" target="_sCFf1yk6Eem-J7NZSmLltA">
+          <children xmi:type="notation:Node" xmi:id="_sCw1QCk6Eem-J7NZSmLltA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCw1QSk6Eem-J7NZSmLltA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCw1Qik6Eem-J7NZSmLltA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCw1Qyk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sCw1RCk6Eem-J7NZSmLltA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sCw1RSk6Eem-J7NZSmLltA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sCwOSyk6Eem-J7NZSmLltA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_sCwOTCk6Eem-J7NZSmLltA" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sCwOTSk6Eem-J7NZSmLltA" points="[0, 0, -487, 60]$[487, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCw1Rik6Eem-J7NZSmLltA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sCw1Ryk6Eem-J7NZSmLltA" id="(0.496551724137931,1.0)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_OZECk6Eem-J7NZSmLltA" name="AppliesToType" tooltipText="" outgoingEdges="_sBzL8Ck6Eem-J7NZSmLltA" incomingEdges="_sBuTdik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//AppliesToType"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//AppliesToType"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_Q1UCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAXolyk6Eem-J7NZSmLltA" name="id : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//AppliesToType/id"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//AppliesToType/id"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAYPoSk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAY2sCk6Eem-J7NZSmLltA" name="publicationStage : PubStage = IS" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//AppliesToType/publicationStage"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//AppliesToType/publicationStage"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAY2sSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAY2sik6Eem-J7NZSmLltA" name="revision : EString = A" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//AppliesToType/revision"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//AppliesToType/revision"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAY2syk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_SDcCk6Eem-J7NZSmLltA" name="DependsOnType" tooltipText="" outgoingEdges="_sBzzBik6Eem-J7NZSmLltA" incomingEdges="_sBlwkyk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//DependsOnType"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//DependsOnType"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_SqgCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAZdwCk6Eem-J7NZSmLltA" name="id : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DependsOnType/id"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DependsOnType/id"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAZdwSk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAZdwik6Eem-J7NZSmLltA" name="publicationStage : PubStage = IS" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DependsOnType/publicationStage"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DependsOnType/publicationStage"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAaE0Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAaE0Sk6Eem-J7NZSmLltA" name="revision : EString = A" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DependsOnType/revision"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DependsOnType/revision"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAaE0ik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_Sqgik6Eem-J7NZSmLltA" name="DocumentRoot" tooltipText="" outgoingEdges="_sBaKYCk6Eem-J7NZSmLltA _sBaxeSk6Eem-J7NZSmLltA _sBbYhik6Eem-J7NZSmLltA _sBb_lik6Eem-J7NZSmLltA _sBcmpik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//DocumentRoot"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//DocumentRoot"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_T4oCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAaE0yk6Eem-J7NZSmLltA" name="mixed : EFeatureMapEntry" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DocumentRoot/mixed"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DocumentRoot/mixed"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAar4Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAar4Sk6Eem-J7NZSmLltA" name=" xMLNSPrefixMap : EStringToStringMapEntry" tooltipText="">
+        <target xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/xMLNSPrefixMap"/>
+        <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/xMLNSPrefixMap"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAbS8Ck6Eem-J7NZSmLltA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAbS8Sk6Eem-J7NZSmLltA" name=" xSISchemaLocation : EStringToStringMapEntry" tooltipText="">
+        <target xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/xSISchemaLocation"/>
+        <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/xSISchemaLocation"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAbS8ik6Eem-J7NZSmLltA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_UfsCk6Eem-J7NZSmLltA" name="ServiceType" tooltipText="" incomingEdges="_sBeb1yk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceType"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceType"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_UfsSk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAbS8yk6Eem-J7NZSmLltA" name="name : ACSIServicesKind = Associate" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceType/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceType/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAbS9Ck6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_VGwSk6Eem-J7NZSmLltA" name="Abbreviation" tooltipText="" incomingEdges="_sBdNsCk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Abbreviation"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Abbreviation"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_Vt0Ck6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAb6ACk6Eem-J7NZSmLltA" name="descID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Abbreviation/descID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Abbreviation/descID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAb6ASk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAb6Aik6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Abbreviation/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Abbreviation/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAchECk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_Vt0ik6Eem-J7NZSmLltA" name="Abbreviations" tooltipText="" outgoingEdges="_sBdNsCk6Eem-J7NZSmLltA" incomingEdges="_sBm-tik6Eem-J7NZSmLltA _sBseRyk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Abbreviations"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Abbreviations"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_WU4Ck6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_W78Ck6Eem-J7NZSmLltA" name="AbstractLNClass" tooltipText="" outgoingEdges="_sB0aEyk6Eem-J7NZSmLltA" incomingEdges="_sBkidik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//AbstractLNClass"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//AbstractLNClass"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_XjACk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAchESk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//AbstractLNClass/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//AbstractLNClass/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAdIICk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_YxISk6Eem-J7NZSmLltA" name="AnyLNClass" tooltipText="" outgoingEdges="_sBdNuik6Eem-J7NZSmLltA _sB0aGik6Eem-J7NZSmLltA" incomingEdges="_sB0aEyk6Eem-J7NZSmLltA _sB2PSik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//AnyLNClass"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//AnyLNClass"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_ZYMCk6Eem-J7NZSmLltA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAdIISk6Eem-J7NZSmLltA" name="base : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//AnyLNClass/base"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//AnyLNClass/base"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAdvMCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_Z_QCk6Eem-J7NZSmLltA" name="ApplicableServiceNS" tooltipText="" outgoingEdges="_sBeb0Ck6Eem-J7NZSmLltA _sB0aISk6Eem-J7NZSmLltA" incomingEdges="_sBaKYCk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ApplicableServiceNS"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ApplicableServiceNS"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_amUCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAdvMSk6Eem-J7NZSmLltA" name="date : DateTime" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ApplicableServiceNS/date"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ApplicableServiceNS/date"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAeWQCk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAeWQSk6Eem-J7NZSmLltA" name="version : UnsignedInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ApplicableServiceNS/version"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ApplicableServiceNS/version"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAeWQik6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_bNYCk6Eem-J7NZSmLltA" name="ApplicableServices" tooltipText="" outgoingEdges="_sBeb1yk6Eem-J7NZSmLltA _sBfC5ik6Eem-J7NZSmLltA" incomingEdges="_sBj7Yyk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ApplicableServices"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ApplicableServices"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_b0cCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_cbgSk6Eem-J7NZSmLltA" name="BasicType" tooltipText="" incomingEdges="_sBfC7Sk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//BasicType"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//BasicType"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_dCkCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAe9UCk6Eem-J7NZSmLltA" name="descID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//BasicType/descID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//BasicType/descID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAfkYCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAfkYSk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//BasicType/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//BasicType/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAfkYik6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_dpoCk6Eem-J7NZSmLltA" name="BasicTypes" tooltipText="" outgoingEdges="_sBfC7Sk6Eem-J7NZSmLltA" incomingEdges="_sBlwmik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//BasicTypes"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//BasicTypes"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_eQsCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_fe0Ck6Eem-J7NZSmLltA" name="CDC" tooltipText="" outgoingEdges="_sBfp9ik6Eem-J7NZSmLltA _sBgRBik6Eem-J7NZSmLltA _sBgRDSk6Eem-J7NZSmLltA _sB1BJik6Eem-J7NZSmLltA" incomingEdges="_sBg4Fik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//CDC"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//CDC"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_gs8Ck6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAgLcCk6Eem-J7NZSmLltA" name="enumParameterized : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/enumParameterized"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/enumParameterized"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAgLcSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAgygCk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAgygSk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAgygik6Eem-J7NZSmLltA" name="statistics : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/statistics"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/statistics"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAhZkCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAhZkSk6Eem-J7NZSmLltA" name="typeKindParameterized : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/typeKindParameterized"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/typeKindParameterized"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAhZkik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAhZkyk6Eem-J7NZSmLltA" name="variant : Token" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/variant"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//CDC/variant"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAiAoCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_gs8ik6Eem-J7NZSmLltA" name="CDCs" tooltipText="" outgoingEdges="_sBg4Fik6Eem-J7NZSmLltA" incomingEdges="_sBoM1ik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//CDCs"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//CDCs"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_hUACk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_h7ESk6Eem-J7NZSmLltA" name="Changes" tooltipText="" outgoingEdges="_sB1BLSk6Eem-J7NZSmLltA" incomingEdges="_sBlJhik6Eem-J7NZSmLltA _sBrQKik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Changes"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Changes"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_iiICk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAiAoSk6Eem-J7NZSmLltA" name="changesID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Changes/changesID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Changes/changesID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAiAoik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAinsCk6Eem-J7NZSmLltA" name="date : Date" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Changes/date"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Changes/date"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAinsSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAinsik6Eem-J7NZSmLltA" name="revision : EString = A" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Changes/revision"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Changes/revision"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAinsyk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAintCk6Eem-J7NZSmLltA" name="tissues : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Changes/tissues"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Changes/tissues"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAjOwCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_jJMSk6Eem-J7NZSmLltA" name="ConstructedAttribute" tooltipText="" outgoingEdges="_sBhfJik6Eem-J7NZSmLltA _sB1BNCk6Eem-J7NZSmLltA" incomingEdges="_sBhfLSk6Eem-J7NZSmLltA _sBu6hik6Eem-J7NZSmLltA _sB22ZCk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ConstructedAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ConstructedAttribute"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_jwQCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAjOwSk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ConstructedAttribute/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ConstructedAttribute/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAjOwik6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_jwQik6Eem-J7NZSmLltA" name="ConstructedAttributes" tooltipText="" outgoingEdges="_sBhfLSk6Eem-J7NZSmLltA" incomingEdges="_sBnlzSk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ConstructedAttributes"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ConstructedAttributes"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_kXUCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_kXUik6Eem-J7NZSmLltA" name="Copyrighted" tooltipText="" outgoingEdges="_sBd0ySk6Eem-J7NZSmLltA" incomingEdges="_sB0aISk6Eem-J7NZSmLltA _sB2PUSk6Eem-J7NZSmLltA _sB22Vik6Eem-J7NZSmLltA _sB3dbSk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Copyrighted"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Copyrighted"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_k-YCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_k-Yik6Eem-J7NZSmLltA" name="CopyrightNotice" tooltipText="" outgoingEdges="_sBiGNik6Eem-J7NZSmLltA _sBitRik6Eem-J7NZSmLltA" incomingEdges="_sBaxeSk6Eem-J7NZSmLltA _sBd0ySk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//CopyrightNotice"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//CopyrightNotice"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_llcCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_mMgCk6Eem-J7NZSmLltA" name="DataAttribute" tooltipText="" outgoingEdges="_sB1oNik6Eem-J7NZSmLltA" incomingEdges="_sBgRBik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//DataAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//DataAttribute"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_oBsCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAj10Ck6Eem-J7NZSmLltA" name="dchg : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/dchg"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/dchg"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAkc4Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAkc4Sk6Eem-J7NZSmLltA" name="defaultValue : NormalizedString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/defaultValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/defaultValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAkc4ik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAkc4yk6Eem-J7NZSmLltA" name="dupd : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/dupd"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/dupd"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAkc5Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAlD8Ck6Eem-J7NZSmLltA" name="fc : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/fc"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/fc"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAlD8Sk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAlD8ik6Eem-J7NZSmLltA" name="isArray : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/isArray"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/isArray"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAlD8yk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAlD9Ck6Eem-J7NZSmLltA" name="maxIndexAttribute : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/maxIndexAttribute"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/maxIndexAttribute"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAlrACk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAlrASk6Eem-J7NZSmLltA" name="maxValue : Decimal" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/maxValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/maxValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAlrAik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAlrAyk6Eem-J7NZSmLltA" name="minIndex : UnsignedInt = 0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/minIndex"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/minIndex"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAmSECk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAmSESk6Eem-J7NZSmLltA" name="minValue : Decimal" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/minValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/minValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAmSEik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAmSEyk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAm5ICk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAm5ISk6Eem-J7NZSmLltA" name="presCond : EString = M" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/presCond"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/presCond"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAm5Iik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAm5Iyk6Eem-J7NZSmLltA" name="presCondArgs : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/presCondArgs"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/presCondArgs"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAngMCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAngMSk6Eem-J7NZSmLltA" name="presCondArgsID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/presCondArgsID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/presCondArgsID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAngMik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAngMyk6Eem-J7NZSmLltA" name="qchg : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/qchg"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/qchg"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAngNCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAngNSk6Eem-J7NZSmLltA" name="sizeAttribute : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/sizeAttribute"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/sizeAttribute"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAoHQCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAoHQSk6Eem-J7NZSmLltA" name="type : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/type"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAoHQik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAoHQyk6Eem-J7NZSmLltA" name="typeKind : AttributeTypeKind = BASIC" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/typeKind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataAttribute/typeKind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAouUCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_oowSk6Eem-J7NZSmLltA" name="DataObject" tooltipText="" outgoingEdges="_sB1oPSk6Eem-J7NZSmLltA" incomingEdges="_sBdNuik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//DataObject"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//DataObject"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_p24Ck6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAouUSk6Eem-J7NZSmLltA" name="dsPresCond : EString = M" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/dsPresCond"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/dsPresCond"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAouUik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAouUyk6Eem-J7NZSmLltA" name="dsPresCondArgs : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/dsPresCondArgs"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/dsPresCondArgs"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sApVYCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sApVYSk6Eem-J7NZSmLltA" name="dsPresCondArgsID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/dsPresCondArgsID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/dsPresCondArgsID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sApVYik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sApVYyk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAp8cCk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAp8cSk6Eem-J7NZSmLltA" name="presCond : EString = M" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/presCond"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/presCond"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAp8cik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAp8cyk6Eem-J7NZSmLltA" name="presCondArgs : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/presCondArgs"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/presCondArgs"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAqjgCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAqjgSk6Eem-J7NZSmLltA" name="presCondArgsID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/presCondArgsID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/presCondArgsID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAqjgik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAqjgyk6Eem-J7NZSmLltA" name="transient : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/transient"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/transient"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAqjhCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sArKkCk6Eem-J7NZSmLltA" name="type : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/type"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sArKkSk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sArKkik6Eem-J7NZSmLltA" name="underlyingType : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/underlyingType"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/underlyingType"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sArKkyk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sArKlCk6Eem-J7NZSmLltA" name="underlyingTypeKind : DefinedAttributeTypeKind = BASIC" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/underlyingTypeKind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataObject/underlyingTypeKind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sArxoCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_qd8Ck6Eem-J7NZSmLltA" name="DataSetMemberOf" tooltipText="" incomingEdges="_sBfC5ik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//DataSetMemberOf"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//DataSetMemberOf"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_qd8Sk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sArxoSk6Eem-J7NZSmLltA" name="cb : CBKind = RCB" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DataSetMemberOf/cb"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DataSetMemberOf/cb"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAsYsCk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_rsEik6Eem-J7NZSmLltA" name="Doc" tooltipText="" incomingEdges="_sBpa8Ck6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Doc"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Doc"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_sTICk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAsYsSk6Eem-J7NZSmLltA" name="mixed : EFeatureMapEntry" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Doc/mixed"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Doc/mixed"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAsYsik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAsYsyk6Eem-J7NZSmLltA" name="/group : EFeatureMapEntry" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Doc/group"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Doc/group"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAs_wSk6Eem-J7NZSmLltA" labelColor="39,76,114" labelAlignment="LEFT" description="_sAs_wCk6Eem-J7NZSmLltA"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAs_wik6Eem-J7NZSmLltA" name="/any : EFeatureMapEntry" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Doc/any"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Doc/any"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAs_wyk6Eem-J7NZSmLltA" labelColor="39,76,114" labelAlignment="LEFT" description="_sAs_wCk6Eem-J7NZSmLltA"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAtm0Ck6Eem-J7NZSmLltA" name="id : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Doc/id"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Doc/id"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAtm0Sk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_s6MSk6Eem-J7NZSmLltA" name="DocumentedClass" tooltipText="" incomingEdges="_sB1oNik6Eem-J7NZSmLltA _sB1oPSk6Eem-J7NZSmLltA _sB2PQyk6Eem-J7NZSmLltA _sB3dZik6Eem-J7NZSmLltA _sB4EfSk6Eem-J7NZSmLltA _sB4EhCk6Eem-J7NZSmLltA _sB4rgyk6Eem-J7NZSmLltA _sB4riik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//DocumentedClass"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//DocumentedClass"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_thQCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAtm0ik6Eem-J7NZSmLltA" name="deprecated : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DocumentedClass/deprecated"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DocumentedClass/deprecated"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAuN4Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAuN4Sk6Eem-J7NZSmLltA" name="descID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DocumentedClass/descID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DocumentedClass/descID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAuN4ik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAuN4yk6Eem-J7NZSmLltA" name="informative : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//DocumentedClass/informative"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//DocumentedClass/informative"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAu08Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_thQik6Eem-J7NZSmLltA" name="Enumeration" tooltipText="" outgoingEdges="_sBitTSk6Eem-J7NZSmLltA _sB1oRCk6Eem-J7NZSmLltA" incomingEdges="_sBjUVik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Enumeration"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Enumeration"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_uvYCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAu08Sk6Eem-J7NZSmLltA" name="inheritedFrom : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Enumeration/inheritedFrom"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Enumeration/inheritedFrom"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAvcACk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAvcASk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Enumeration/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Enumeration/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAvcAik6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_uvYik6Eem-J7NZSmLltA" name="Enumerations" tooltipText="" outgoingEdges="_sBjUVik6Eem-J7NZSmLltA" incomingEdges="_sBnlxik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Enumerations"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Enumerations"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_vWcCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_vWcik6Eem-J7NZSmLltA" name="FunctionalConstraint" tooltipText="" outgoingEdges="_sBj7Yyk6Eem-J7NZSmLltA" incomingEdges="_sBj7aik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//FunctionalConstraint"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//FunctionalConstraint"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_wkkCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAwDECk6Eem-J7NZSmLltA" name="abbreviation : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//FunctionalConstraint/abbreviation"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//FunctionalConstraint/abbreviation"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAwDESk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAwqICk6Eem-J7NZSmLltA" name="descID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//FunctionalConstraint/descID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//FunctionalConstraint/descID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAwqISk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAwqIik6Eem-J7NZSmLltA" name="titleID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//FunctionalConstraint/titleID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//FunctionalConstraint/titleID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAxRMCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_xLoCk6Eem-J7NZSmLltA" name="FunctionalConstraints" tooltipText="" outgoingEdges="_sBj7aik6Eem-J7NZSmLltA" incomingEdges="_sBmXoCk6Eem-J7NZSmLltA _sBr3Nik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//FunctionalConstraints"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//FunctionalConstraints"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_xLoSk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_xysCk6Eem-J7NZSmLltA" name="License" tooltipText="" incomingEdges="_sBitRik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//License"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//License"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_yZwCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAxRMSk6Eem-J7NZSmLltA" name="mixed : EFeatureMapEntry" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//License/mixed"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//License/mixed"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAx4QCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAx4QSk6Eem-J7NZSmLltA" name="kind : LicenseKind = Standard" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//License/kind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//License/kind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAx4Qik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAyfUCk6Eem-J7NZSmLltA" name="uri : NormalizedString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//License/uri"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//License/uri"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAyfUSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_zn4Sk6Eem-J7NZSmLltA" name="Literal" tooltipText="" outgoingEdges="_sB2PQyk6Eem-J7NZSmLltA" incomingEdges="_sBitTSk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Literal"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Literal"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_0O8Ck6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAyfUik6Eem-J7NZSmLltA" name="literalVal : Int" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Literal/literalVal"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Literal/literalVal"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAzGYCk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAzGYSk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Literal/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Literal/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAzGYik6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_0O8ik6Eem-J7NZSmLltA" name="LNClass" tooltipText="" outgoingEdges="_sB2PSik6Eem-J7NZSmLltA" incomingEdges="_sBkifSk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//LNClass"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//LNClass"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_02ACk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAztcCk6Eem-J7NZSmLltA" name="canHaveLOG : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//LNClass/canHaveLOG"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//LNClass/canHaveLOG"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAztcSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sAztcik6Eem-J7NZSmLltA" name="isExtension : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//LNClass/isExtension"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//LNClass/isExtension"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sAztcyk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA0UgCk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//LNClass/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//LNClass/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA0UgSk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_1dECk6Eem-J7NZSmLltA" name="LNClasses" tooltipText="" outgoingEdges="_sBkidik6Eem-J7NZSmLltA _sBkifSk6Eem-J7NZSmLltA" incomingEdges="_sBoz5ik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//LNClasses"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//LNClasses"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_2EICk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_2EIik6Eem-J7NZSmLltA" name="Notice" tooltipText="" incomingEdges="_sBiGNik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Notice"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Notice"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_2rMCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA07kCk6Eem-J7NZSmLltA" name="mixed : EFeatureMapEntry" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//Notice/mixed"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//Notice/mixed"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA07kSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_2rMik6Eem-J7NZSmLltA" name="NS" tooltipText="" outgoingEdges="_sBlJhik6Eem-J7NZSmLltA _sBlwkyk6Eem-J7NZSmLltA _sBlwmik6Eem-J7NZSmLltA _sBmXoCk6Eem-J7NZSmLltA _sBmXpyk6Eem-J7NZSmLltA _sBm-tik6Eem-J7NZSmLltA _sBnlxik6Eem-J7NZSmLltA _sBnlzSk6Eem-J7NZSmLltA _sBoM1ik6Eem-J7NZSmLltA _sBoz5ik6Eem-J7NZSmLltA _sB2PUSk6Eem-J7NZSmLltA _sB2PWCk6Eem-J7NZSmLltA" incomingEdges="_sBbYhik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//NS"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//NS"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_4gYCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA07kik6Eem-J7NZSmLltA" name="descID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/descID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/descID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA1ioCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA1ioSk6Eem-J7NZSmLltA" name="id : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/id"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/id"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA2JsCk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA2JsSk6Eem-J7NZSmLltA" name="publicationStage : PubStage = IS" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/publicationStage"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/publicationStage"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA2Jsik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA2Jsyk6Eem-J7NZSmLltA" name="revision : EString = A" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/revision"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/revision"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA2wwCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA2wwSk6Eem-J7NZSmLltA" name="umlDate : DateTime" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/umlDate"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/umlDate"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA2wwik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA3X0Ck6Eem-J7NZSmLltA" name="umlVersion : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/umlVersion"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NS/umlVersion"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA3X0Sk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_5HcCk6Eem-J7NZSmLltA" name="NSDoc" tooltipText="" outgoingEdges="_sBpa8Ck6Eem-J7NZSmLltA _sB22Vik6Eem-J7NZSmLltA _sB22XSk6Eem-J7NZSmLltA" incomingEdges="_sBb_lik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//NSDoc"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//NSDoc"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_5ugCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA3X0ik6Eem-J7NZSmLltA" name="id : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/id"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/id"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA3-4Ck6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA3-4Sk6Eem-J7NZSmLltA" name="lang : Language" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/lang"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/lang"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA4l8Ck6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA4l8Sk6Eem-J7NZSmLltA" name="publicationStage : PubStage = IS" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/publicationStage"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/publicationStage"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA4l8ik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA4l8yk6Eem-J7NZSmLltA" name="revision : EString = A" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/revision"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/revision"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA5NACk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA5NASk6Eem-J7NZSmLltA" name="umlDate : DateTime" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/umlDate"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/umlDate"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA5NAik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA5NAyk6Eem-J7NZSmLltA" name="umlVersion : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/umlVersion"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDoc/umlVersion"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA50ECk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_5ugik6Eem-J7NZSmLltA" name="PresenceCondition" tooltipText="" incomingEdges="_sBpa9yk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//PresenceCondition"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//PresenceCondition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_6VkCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA50ESk6Eem-J7NZSmLltA" name="argument : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//PresenceCondition/argument"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//PresenceCondition/argument"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA50Eik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA6bICk6Eem-J7NZSmLltA" name="descID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//PresenceCondition/descID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//PresenceCondition/descID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA6bISk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA6bIik6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//PresenceCondition/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//PresenceCondition/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA7CMCk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA7CMSk6Eem-J7NZSmLltA" name="titleID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//PresenceCondition/titleID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//PresenceCondition/titleID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA7CMik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_68oSk6Eem-J7NZSmLltA" name="PresenceConditions" tooltipText="" outgoingEdges="_sBpa9yk6Eem-J7NZSmLltA" incomingEdges="_sBmXpyk6Eem-J7NZSmLltA _sBseQCk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//PresenceConditions"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//PresenceConditions"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_7jsCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_8KxCk6Eem-J7NZSmLltA" name="ServiceCDC" tooltipText="" outgoingEdges="_sBqCBik6Eem-J7NZSmLltA" incomingEdges="_sBqpFik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceCDC"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceCDC"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_8x0Ck6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA7pQCk6Eem-J7NZSmLltA" name="cdc : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceCDC/cdc"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceCDC/cdc"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA7pQSk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA7pQik6Eem-J7NZSmLltA" name="variant : Token" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceCDC/variant"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceCDC/variant"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA7pQyk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_9Y4Ck6Eem-J7NZSmLltA" name="ServiceCDCs" tooltipText="" outgoingEdges="_sBqpFik6Eem-J7NZSmLltA" incomingEdges="_sBtsbSk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceCDCs"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceCDCs"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_9Y4Sk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_9_8Ck6Eem-J7NZSmLltA" name="ServiceConstructedAttribute" tooltipText="" outgoingEdges="_sB22ZCk6Eem-J7NZSmLltA" incomingEdges="_sBrQIyk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceConstructedAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceConstructedAttribute"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_9_8Sk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA8QUCk6Eem-J7NZSmLltA" name="typeKindParameterized : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceConstructedAttribute/typeKindParameterized"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceConstructedAttribute/typeKindParameterized"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA8QUSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r_-nASk6Eem-J7NZSmLltA" name="ServiceConstructedAttributes" tooltipText="" outgoingEdges="_sBrQIyk6Eem-J7NZSmLltA" incomingEdges="_sBtsZik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceConstructedAttributes"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceConstructedAttributes"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r_-nAik6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_r__OESk6Eem-J7NZSmLltA" name="ServiceDataAttribute" tooltipText="" outgoingEdges="_sB3dZik6Eem-J7NZSmLltA" incomingEdges="_sBqCBik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceDataAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceDataAttribute"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r__1ICk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA83YCk6Eem-J7NZSmLltA" name="fc : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/fc"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/fc"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA83YSk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA83Yik6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA9ecCk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA9ecSk6Eem-J7NZSmLltA" name="presCond : EString = M" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/presCond"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/presCond"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA9ecik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA9ecyk6Eem-J7NZSmLltA" name="presCondArgs : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/presCondArgs"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/presCondArgs"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA-FgCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA-FgSk6Eem-J7NZSmLltA" name="presCondArgsID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/presCondArgsID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/presCondArgsID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA-Fgik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA-Fgyk6Eem-J7NZSmLltA" name="type : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/type"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA-skCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA-skSk6Eem-J7NZSmLltA" name="typeKind : AttributeTypeKind = BASIC" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/typeKind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/typeKind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA-skik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA_ToCk6Eem-J7NZSmLltA" name="underlyingType : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/underlyingType"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/underlyingType"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA_ToSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA_Toik6Eem-J7NZSmLltA" name="underlyingTypeKind : DefinedAttributeTypeKind = BASIC" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/underlyingTypeKind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceDataAttribute/underlyingTypeKind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA_Toyk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sAAcMSk6Eem-J7NZSmLltA" name="ServiceNS" tooltipText="" outgoingEdges="_sBrQKik6Eem-J7NZSmLltA _sBr3Nik6Eem-J7NZSmLltA _sBseQCk6Eem-J7NZSmLltA _sBseRyk6Eem-J7NZSmLltA _sBtFVik6Eem-J7NZSmLltA _sBtsZik6Eem-J7NZSmLltA _sBtsbSk6Eem-J7NZSmLltA _sB3dbSk6Eem-J7NZSmLltA _sB3ddCk6Eem-J7NZSmLltA" incomingEdges="_sBcmpik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNS"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNS"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sACRYCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA_6sCk6Eem-J7NZSmLltA" name="descID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/descID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/descID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA_6sSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sA_6sik6Eem-J7NZSmLltA" name="id : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/id"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/id"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sA_6syk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBAhwCk6Eem-J7NZSmLltA" name="publicationStage : PubStage = IS" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/publicationStage"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/publicationStage"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBAhwSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBAhwik6Eem-J7NZSmLltA" name="revision : EString = A" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/revision"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/revision"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBAhwyk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBAhxCk6Eem-J7NZSmLltA" name="umlDate : DateTime" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/umlDate"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/umlDate"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBBI0Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBBI0Sk6Eem-J7NZSmLltA" name="umlVersion : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/umlVersion"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNS/umlVersion"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBBv4Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sACRYik6Eem-J7NZSmLltA" name="ServiceNsUsage" tooltipText="" outgoingEdges="_sBuTdik6Eem-J7NZSmLltA _sB4Edik6Eem-J7NZSmLltA" incomingEdges="_sBeb0Ck6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNsUsage"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNsUsage"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sAC4cCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBBv4Sk6Eem-J7NZSmLltA" name="id : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNsUsage/id"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNsUsage/id"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBBv4ik6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBBv4yk6Eem-J7NZSmLltA" name="publicationStage : PubStage = IS" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNsUsage/publicationStage"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNsUsage/publicationStage"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBCW8Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBCW8Sk6Eem-J7NZSmLltA" name="revision : EString = A" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNsUsage/revision"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceNsUsage/revision"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBCW8ik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sADfgSk6Eem-J7NZSmLltA" name="ServiceParameter" tooltipText="" outgoingEdges="_sB4EfSk6Eem-J7NZSmLltA" incomingEdges="_sBgRDSk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceParameter"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceParameter"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sAEGkCk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBCW8yk6Eem-J7NZSmLltA" name="defaultValue : NormalizedString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/defaultValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/defaultValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBC-ACk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBC-ASk6Eem-J7NZSmLltA" name="maxValue : Decimal" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/maxValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/maxValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBC-Aik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBC-Ayk6Eem-J7NZSmLltA" name="minValue : Decimal" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/minValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/minValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBDlECk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBDlESk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBDlEik6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBDlEyk6Eem-J7NZSmLltA" name="type : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/type"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBDlFCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBDlFSk6Eem-J7NZSmLltA" name="typeKind : AttributeTypeKind = BASIC" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/typeKind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//ServiceParameter/typeKind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBEMICk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sAF7wSk6Eem-J7NZSmLltA" name="ServiceTypeRealizations" tooltipText="" outgoingEdges="_sBu6hik6Eem-J7NZSmLltA" incomingEdges="_sBtFVik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceTypeRealizations"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceTypeRealizations"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sAGi0Ck6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sAGi0ik6Eem-J7NZSmLltA" name="SubDataAttribute" tooltipText="" outgoingEdges="_sB4EhCk6Eem-J7NZSmLltA" incomingEdges="_sBhfJik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//SubDataAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//SubDataAttribute"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sAHw8Ck6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBGBUCk6Eem-J7NZSmLltA" name="defaultValue : NormalizedString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/defaultValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/defaultValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBGBUSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBGBUik6Eem-J7NZSmLltA" name="isArray : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/isArray"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/isArray"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBGoYCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBGoYSk6Eem-J7NZSmLltA" name="maxIndexAttribute : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/maxIndexAttribute"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/maxIndexAttribute"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBGoYik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBGoYyk6Eem-J7NZSmLltA" name="maxValue : Decimal" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/maxValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/maxValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBGoZCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBGoZSk6Eem-J7NZSmLltA" name="minIndex : UnsignedInt = 0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/minIndex"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/minIndex"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBHPcCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBHPcSk6Eem-J7NZSmLltA" name="minValue : Decimal" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/minValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/minValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBHPcik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBHPcyk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBH2gCk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBH2gSk6Eem-J7NZSmLltA" name="presCond : EString = M" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/presCond"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/presCond"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBH2gik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBH2gyk6Eem-J7NZSmLltA" name="presCondArgs : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/presCondArgs"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/presCondArgs"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBIdkCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBIdkSk6Eem-J7NZSmLltA" name="presCondArgsID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/presCondArgsID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/presCondArgsID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBIdkik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBIdkyk6Eem-J7NZSmLltA" name="sizeAttribute : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/sizeAttribute"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/sizeAttribute"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBIdlCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBJEoCk6Eem-J7NZSmLltA" name="type : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/type"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBJEoSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBJEoik6Eem-J7NZSmLltA" name="typeKind : AttributeTypeKind = BASIC" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/typeKind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataAttribute/typeKind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBJEoyk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sAIYASk6Eem-J7NZSmLltA" name="SubDataObject" tooltipText="" outgoingEdges="_sB4rgyk6Eem-J7NZSmLltA" incomingEdges="_sBfp9ik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//SubDataObject"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//SubDataObject"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sAI_ECk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBJrsCk6Eem-J7NZSmLltA" name="isArray : Boolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/isArray"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/isArray"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBJrsSk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBJrsik6Eem-J7NZSmLltA" name="maxIndexAttribute : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/maxIndexAttribute"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/maxIndexAttribute"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBJrsyk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBJrtCk6Eem-J7NZSmLltA" name="minIndex : UnsignedInt = 0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/minIndex"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/minIndex"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBKSwCk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBKSwSk6Eem-J7NZSmLltA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBKSwik6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBKSwyk6Eem-J7NZSmLltA" name="presCond : EString = M" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/presCond"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/presCond"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBK50Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBK50Sk6Eem-J7NZSmLltA" name="presCondArgs : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/presCondArgs"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/presCondArgs"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBK50ik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBK50yk6Eem-J7NZSmLltA" name="presCondArgsID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/presCondArgsID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/presCondArgsID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBLg4Ck6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBLg4Sk6Eem-J7NZSmLltA" name="sizeAttribute : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/sizeAttribute"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/sizeAttribute"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBLg4ik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBLg4yk6Eem-J7NZSmLltA" name="type : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/type"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBMH8Ck6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBMH8Sk6Eem-J7NZSmLltA" name="underlyingType : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/underlyingType"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/underlyingType"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBMH8ik6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBMH8yk6Eem-J7NZSmLltA" name="underlyingTypeKind : DefinedAttributeTypeKind = BASIC" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/underlyingTypeKind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//SubDataObject/underlyingTypeKind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBMvACk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sAJmICk6Eem-J7NZSmLltA" name="TitledClass" tooltipText="" outgoingEdges="_sB4riik6Eem-J7NZSmLltA" incomingEdges="_sB0aGik6Eem-J7NZSmLltA _sB1BJik6Eem-J7NZSmLltA _sB1BNCk6Eem-J7NZSmLltA _sB1oRCk6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//TitledClass"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//TitledClass"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sAJmISk6Eem-J7NZSmLltA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBMvASk6Eem-J7NZSmLltA" name="titleID : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//TitledClass/titleID"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//TitledClass/titleID"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBMvAik6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sAK0QCk6Eem-J7NZSmLltA" name="NSDObjectWithVersionAndRelease" tooltipText="" incomingEdges="_sBzL8Ck6Eem-J7NZSmLltA _sBzzBik6Eem-J7NZSmLltA _sB1BLSk6Eem-J7NZSmLltA _sB2PWCk6Eem-J7NZSmLltA _sB22XSk6Eem-J7NZSmLltA _sB3ddCk6Eem-J7NZSmLltA _sB4Edik6Eem-J7NZSmLltA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//NSDObjectWithVersionAndRelease"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//NSDObjectWithVersionAndRelease"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sAK0QSk6Eem-J7NZSmLltA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBNWECk6Eem-J7NZSmLltA" name="release : EIntegerObject = 1" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDObjectWithVersionAndRelease/release"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDObjectWithVersionAndRelease/release"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBNWESk6Eem-J7NZSmLltA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sBNWEik6Eem-J7NZSmLltA" name="version : EIntegerObject" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDObjectWithVersionAndRelease/version"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="nsd.ecore#//NSDObjectWithVersionAndRelease/version"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_sBNWEyk6Eem-J7NZSmLltA" labelAlignment="LEFT" description="_sAYPoCk6Eem-J7NZSmLltA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBaKYCk6Eem-J7NZSmLltA" name="[0..1] /applicableServiceNS" sourceNode="_r_Sqgik6Eem-J7NZSmLltA" targetNode="_r_Z_QCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/applicableServiceNS"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/applicableServiceNS"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBaxcyk6Eem-J7NZSmLltA" description="_sBaxcCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="114,159,207">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBaxdSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBaxdCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBaxeSk6Eem-J7NZSmLltA" name="[0..-2] /copyright" sourceNode="_r_Sqgik6Eem-J7NZSmLltA" targetNode="_r_k-Yik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/copyright"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/copyright"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBbYgCk6Eem-J7NZSmLltA" description="_sBaxcCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="114,159,207">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBbYgik6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBbYgSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBbYhik6Eem-J7NZSmLltA" name="[0..1] /nS" sourceNode="_r_Sqgik6Eem-J7NZSmLltA" targetNode="_r_2rMik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/nS"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/nS"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBb_kCk6Eem-J7NZSmLltA" description="_sBaxcCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="114,159,207">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBb_kik6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBb_kSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBb_lik6Eem-J7NZSmLltA" name="[0..1] /nSDoc" sourceNode="_r_Sqgik6Eem-J7NZSmLltA" targetNode="_r_5HcCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/nSDoc"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/nSDoc"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBcmoCk6Eem-J7NZSmLltA" description="_sBaxcCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="114,159,207">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBcmoik6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBcmoSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBcmpik6Eem-J7NZSmLltA" name="[0..1] /serviceNS" sourceNode="_r_Sqgik6Eem-J7NZSmLltA" targetNode="_sAAcMSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/serviceNS"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//DocumentRoot/serviceNS"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBcmpyk6Eem-J7NZSmLltA" description="_sBaxcCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="114,159,207">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBcmqSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBcmqCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBdNsCk6Eem-J7NZSmLltA" name="[1..*] abbreviation" sourceNode="_r_Vt0ik6Eem-J7NZSmLltA" targetNode="_r_VGwSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//Abbreviations/abbreviation"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//Abbreviations/abbreviation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBdNtCk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBdNtik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBdNtSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBdNuik6Eem-J7NZSmLltA" name="[0..*] dataObject" sourceNode="_r_YxISk6Eem-J7NZSmLltA" targetNode="_r_oowSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//AnyLNClass/dataObject"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//AnyLNClass/dataObject"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBd0wyk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBd0xSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBd0xCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBd0ySk6Eem-J7NZSmLltA" name="[0..1] copyright" sourceNode="_r_kXUik6Eem-J7NZSmLltA" targetNode="_r_k-Yik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//Copyrighted/copyright"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//Copyrighted/copyright"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBd0yik6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBd0zCk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBd0yyk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBeb0Ck6Eem-J7NZSmLltA" name="[1..*] serviceNsUsage" sourceNode="_r_Z_QCk6Eem-J7NZSmLltA" targetNode="_sACRYik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ApplicableServiceNS/serviceNsUsage"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ApplicableServiceNS/serviceNsUsage"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBeb0Sk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBeb0yk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBeb0ik6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBeb1yk6Eem-J7NZSmLltA" name="[0..*] service" sourceNode="_r_bNYCk6Eem-J7NZSmLltA" targetNode="_r_UfsCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ApplicableServices/service"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ApplicableServices/service"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBfC4Ck6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBfC4ik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBfC4Sk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBfC5ik6Eem-J7NZSmLltA" name="[0..*] dataSetMemberOf" sourceNode="_r_bNYCk6Eem-J7NZSmLltA" targetNode="_r_qd8Ck6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ApplicableServices/dataSetMemberOf"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ApplicableServices/dataSetMemberOf"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBfC5yk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBfC6Sk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBfC6Ck6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBfC7Sk6Eem-J7NZSmLltA" name="[1..*] basicType" sourceNode="_r_dpoCk6Eem-J7NZSmLltA" targetNode="_r_cbgSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//BasicTypes/basicType"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//BasicTypes/basicType"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBfp8Ck6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBfp8ik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBfp8Sk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBfp9ik6Eem-J7NZSmLltA" name="[0..*] subDataObject" sourceNode="_r_fe0Ck6Eem-J7NZSmLltA" targetNode="_sAIYASk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//CDC/subDataObject"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//CDC/subDataObject"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBgRACk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBgRAik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBgRASk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBgRBik6Eem-J7NZSmLltA" name="[1..*] dataAttribute" sourceNode="_r_fe0Ck6Eem-J7NZSmLltA" targetNode="_r_mMgCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//CDC/dataAttribute"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//CDC/dataAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBgRByk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBgRCSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBgRCCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBgRDSk6Eem-J7NZSmLltA" name="[0..1] serviceParameter" sourceNode="_r_fe0Ck6Eem-J7NZSmLltA" targetNode="_sADfgSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//CDC/serviceParameter"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//CDC/serviceParameter"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBg4ECk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBg4Eik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBg4ESk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBg4Fik6Eem-J7NZSmLltA" name="[0..*] cDC" sourceNode="_r_gs8ik6Eem-J7NZSmLltA" targetNode="_r_fe0Ck6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//CDCs/cDC"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//CDCs/cDC"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBhfICk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBhfIik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBhfISk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBhfJik6Eem-J7NZSmLltA" name="[1..*] subDataAttribute" sourceNode="_r_jJMSk6Eem-J7NZSmLltA" targetNode="_sAGi0ik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ConstructedAttribute/subDataAttribute"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ConstructedAttribute/subDataAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBhfJyk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBhfKSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBhfKCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBhfLSk6Eem-J7NZSmLltA" name="[0..*] constructedAttribute" sourceNode="_r_jwQik6Eem-J7NZSmLltA" targetNode="_r_jJMSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ConstructedAttributes/constructedAttribute"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ConstructedAttributes/constructedAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBiGMCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBiGMik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBiGMSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBiGNik6Eem-J7NZSmLltA" name="[1..1] notice" sourceNode="_r_k-Yik6Eem-J7NZSmLltA" targetNode="_r_2EIik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//CopyrightNotice/notice"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//CopyrightNotice/notice"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBitQCk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBitQik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBitQSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBitRik6Eem-J7NZSmLltA" name="[1..1] license" sourceNode="_r_k-Yik6Eem-J7NZSmLltA" targetNode="_r_xysCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//CopyrightNotice/license"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//CopyrightNotice/license"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBitRyk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBitSSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBitSCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBitTSk6Eem-J7NZSmLltA" name="[1..*] literal" sourceNode="_r_thQik6Eem-J7NZSmLltA" targetNode="_r_zn4Sk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//Enumeration/literal"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//Enumeration/literal"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBjUUCk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBjUUik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBjUUSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBjUVik6Eem-J7NZSmLltA" name="[0..*] enumeration" sourceNode="_r_uvYik6Eem-J7NZSmLltA" targetNode="_r_thQik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//Enumerations/enumeration"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//Enumerations/enumeration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBjUVyk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBjUWSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBjUWCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBj7Yyk6Eem-J7NZSmLltA" name="[0..1] applicableServices" sourceNode="_r_vWcik6Eem-J7NZSmLltA" targetNode="_r_bNYCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//FunctionalConstraint/applicableServices"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//FunctionalConstraint/applicableServices"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBj7ZCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBj7Zik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBj7ZSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBj7aik6Eem-J7NZSmLltA" name="[1..*] functionalConstraint" sourceNode="_r_xLoCk6Eem-J7NZSmLltA" targetNode="_r_vWcik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//FunctionalConstraints/functionalConstraint"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//FunctionalConstraints/functionalConstraint"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBkicCk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBkicik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBkicSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBkidik6Eem-J7NZSmLltA" name="[0..*] abstractLNClass" sourceNode="_r_1dECk6Eem-J7NZSmLltA" targetNode="_r_W78Ck6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//LNClasses/abstractLNClass"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//LNClasses/abstractLNClass"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBkidyk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBkieSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBkieCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBkifSk6Eem-J7NZSmLltA" name="[0..*] lNClass" sourceNode="_r_1dECk6Eem-J7NZSmLltA" targetNode="_r_0O8ik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//LNClasses/lNClass"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//LNClasses/lNClass"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBlJgCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBlJgik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBlJgSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBlJhik6Eem-J7NZSmLltA" name="[0..1] changes" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_h7ESk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/changes"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/changes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBlJhyk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBlJiSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBlJiCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBlwkyk6Eem-J7NZSmLltA" name="[0..1] dependsOn" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_SDcCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/dependsOn"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/dependsOn"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBlwlCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBlwlik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBlwlSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBlwmik6Eem-J7NZSmLltA" name="[0..1] basicTypes" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_dpoCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/basicTypes"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/basicTypes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBlwmyk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBlwnSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBlwnCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBmXoCk6Eem-J7NZSmLltA" name="[0..1] functionalConstraints" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_xLoCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/functionalConstraints"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/functionalConstraints"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBmXoSk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBmXoyk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBmXoik6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBmXpyk6Eem-J7NZSmLltA" name="[0..1] presenceConditions" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_68oSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/presenceConditions"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/presenceConditions"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBm-sCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBm-sik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBm-sSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBm-tik6Eem-J7NZSmLltA" name="[0..1] abbreviations" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_Vt0ik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/abbreviations"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/abbreviations"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBnlwCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBnlwik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBnlwSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBnlxik6Eem-J7NZSmLltA" name="[0..1] enumerations" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_uvYik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/enumerations"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/enumerations"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBnlxyk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBnlySk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBnlyCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBnlzSk6Eem-J7NZSmLltA" name="[0..1] constructedAttributes" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_jwQik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/constructedAttributes"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/constructedAttributes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBoM0Ck6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBoM0ik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBoM0Sk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBoM1ik6Eem-J7NZSmLltA" name="[0..1] cDCs" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_gs8ik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/cDCs"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/cDCs"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBoz4Ck6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBoz4ik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBoz4Sk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBoz5ik6Eem-J7NZSmLltA" name="[0..1] lNClasses" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_1dECk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NS/lNClasses"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NS/lNClasses"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBoz5yk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBoz6Sk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBoz6Ck6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBpa8Ck6Eem-J7NZSmLltA" name="[1..*] doc" sourceNode="_r_5HcCk6Eem-J7NZSmLltA" targetNode="_r_rsEik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//NSDoc/doc"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//NSDoc/doc"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBpa8Sk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBpa8yk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBpa8ik6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBpa9yk6Eem-J7NZSmLltA" name="[1..*] presenceCondition" sourceNode="_r_68oSk6Eem-J7NZSmLltA" targetNode="_r_5ugik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//PresenceConditions/presenceCondition"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//PresenceConditions/presenceCondition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBqCACk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBqCAik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBqCASk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBqCBik6Eem-J7NZSmLltA" name="[1..*] serviceDataAttribute" sourceNode="_r_8KxCk6Eem-J7NZSmLltA" targetNode="_r__OESk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceCDC/serviceDataAttribute"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceCDC/serviceDataAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBqpECk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBqpEik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBqpESk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBqpFik6Eem-J7NZSmLltA" name="[0..*] serviceCDC" sourceNode="_r_9Y4Ck6Eem-J7NZSmLltA" targetNode="_r_8KxCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceCDCs/serviceCDC"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceCDCs/serviceCDC"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBqpFyk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBqpGSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBqpGCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBrQIyk6Eem-J7NZSmLltA" name="[0..*] serviceConstructedAttribute" sourceNode="_r_-nASk6Eem-J7NZSmLltA" targetNode="_r_9_8Ck6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceConstructedAttributes/serviceConstructedAttribute"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceConstructedAttributes/serviceConstructedAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBrQJCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBrQJik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBrQJSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBrQKik6Eem-J7NZSmLltA" name="[0..1] changes" sourceNode="_sAAcMSk6Eem-J7NZSmLltA" targetNode="_r_h7ESk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/changes"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/changes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBr3MCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBr3Mik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBr3MSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBr3Nik6Eem-J7NZSmLltA" name="[0..1] functionalConstraints" sourceNode="_sAAcMSk6Eem-J7NZSmLltA" targetNode="_r_xLoCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/functionalConstraints"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/functionalConstraints"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBr3Nyk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBr3OSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBr3OCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBseQCk6Eem-J7NZSmLltA" name="[0..1] presenceConditions" sourceNode="_sAAcMSk6Eem-J7NZSmLltA" targetNode="_r_68oSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/presenceConditions"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/presenceConditions"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBseQSk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBseQyk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBseQik6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBseRyk6Eem-J7NZSmLltA" name="[0..1] abbreviations" sourceNode="_sAAcMSk6Eem-J7NZSmLltA" targetNode="_r_Vt0ik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/abbreviations"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/abbreviations"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBtFUCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBtFUik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBtFUSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBtFVik6Eem-J7NZSmLltA" name="[0..1] serviceTypeRealizations" sourceNode="_sAAcMSk6Eem-J7NZSmLltA" targetNode="_sAF7wSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/serviceTypeRealizations"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/serviceTypeRealizations"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBtsYCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBtsYik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBtsYSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBtsZik6Eem-J7NZSmLltA" name="[0..1] serviceConstructedAttributes" sourceNode="_sAAcMSk6Eem-J7NZSmLltA" targetNode="_r_-nASk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/serviceConstructedAttributes"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/serviceConstructedAttributes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBtsZyk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBtsaSk6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBtsaCk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBtsbSk6Eem-J7NZSmLltA" name="[0..1] serviceCDCs" sourceNode="_sAAcMSk6Eem-J7NZSmLltA" targetNode="_r_9Y4Ck6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/serviceCDCs"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNS/serviceCDCs"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBuTcCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBuTcik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBuTcSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBuTdik6Eem-J7NZSmLltA" name="[1..*] appliesTo" sourceNode="_sACRYik6Eem-J7NZSmLltA" targetNode="_r_OZECk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNsUsage/appliesTo"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceNsUsage/appliesTo"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBu6gCk6Eem-J7NZSmLltA" description="_sBdNsSk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBu6gik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBu6gSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBu6hik6Eem-J7NZSmLltA" name="[0..*] serviceTypeRealization" sourceNode="_sAF7wSk6Eem-J7NZSmLltA" targetNode="_r_jJMSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EReference" href="nsd.ecore#//ServiceTypeRealizations/serviceTypeRealization"/>
+      <semanticElements xmi:type="ecore:EReference" href="nsd.ecore#//ServiceTypeRealizations/serviceTypeRealization"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBvhkCk6Eem-J7NZSmLltA" description="_sBd0wCk6Eem-J7NZSmLltA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBvhkik6Eem-J7NZSmLltA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sBvhkSk6Eem-J7NZSmLltA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBzL8Ck6Eem-J7NZSmLltA" sourceNode="_r_OZECk6Eem-J7NZSmLltA" targetNode="_sAK0QCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//AppliesToType"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//AppliesToType"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBzzACk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sBzzASk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBzzAik6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sBzzBik6Eem-J7NZSmLltA" sourceNode="_r_SDcCk6Eem-J7NZSmLltA" targetNode="_sAK0QCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//DependsOnType"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//DependsOnType"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sBzzByk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sBzzCCk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sBzzCSk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB0aEyk6Eem-J7NZSmLltA" sourceNode="_r_W78Ck6Eem-J7NZSmLltA" targetNode="_r_YxISk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//AbstractLNClass"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//AbstractLNClass"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB0aFCk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB0aFSk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB0aFik6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB0aGik6Eem-J7NZSmLltA" sourceNode="_r_YxISk6Eem-J7NZSmLltA" targetNode="_sAJmICk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//AnyLNClass"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//AnyLNClass"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB0aGyk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB0aHCk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB0aHSk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB0aISk6Eem-J7NZSmLltA" sourceNode="_r_Z_QCk6Eem-J7NZSmLltA" targetNode="_r_kXUik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ApplicableServiceNS"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ApplicableServiceNS"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB1BICk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB1BISk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB1BIik6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB1BJik6Eem-J7NZSmLltA" sourceNode="_r_fe0Ck6Eem-J7NZSmLltA" targetNode="_sAJmICk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//CDC"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//CDC"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB1BJyk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB1BKCk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB1BKSk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB1BLSk6Eem-J7NZSmLltA" sourceNode="_r_h7ESk6Eem-J7NZSmLltA" targetNode="_sAK0QCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Changes"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Changes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB1BLik6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB1BLyk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB1BMCk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB1BNCk6Eem-J7NZSmLltA" sourceNode="_r_jJMSk6Eem-J7NZSmLltA" targetNode="_sAJmICk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ConstructedAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ConstructedAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB1oMCk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB1oMSk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB1oMik6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB1oNik6Eem-J7NZSmLltA" sourceNode="_r_mMgCk6Eem-J7NZSmLltA" targetNode="_r_s6MSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//DataAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//DataAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB1oNyk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB1oOCk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB1oOSk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB1oPSk6Eem-J7NZSmLltA" sourceNode="_r_oowSk6Eem-J7NZSmLltA" targetNode="_r_s6MSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//DataObject"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//DataObject"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB1oPik6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB1oPyk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB1oQCk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB1oRCk6Eem-J7NZSmLltA" sourceNode="_r_thQik6Eem-J7NZSmLltA" targetNode="_sAJmICk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Enumeration"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Enumeration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB1oRSk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB1oRik6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB1oRyk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB2PQyk6Eem-J7NZSmLltA" sourceNode="_r_zn4Sk6Eem-J7NZSmLltA" targetNode="_r_s6MSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//Literal"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//Literal"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB2PRCk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB2PRSk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB2PRik6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB2PSik6Eem-J7NZSmLltA" sourceNode="_r_0O8ik6Eem-J7NZSmLltA" targetNode="_r_YxISk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//LNClass"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//LNClass"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB2PSyk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB2PTCk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB2PTSk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB2PUSk6Eem-J7NZSmLltA" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_r_kXUik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//NS"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//NS"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB2PUik6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB2PUyk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB2PVCk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB2PWCk6Eem-J7NZSmLltA" sourceNode="_r_2rMik6Eem-J7NZSmLltA" targetNode="_sAK0QCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//NS"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//NS"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB22UCk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB22USk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB22Uik6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB22Vik6Eem-J7NZSmLltA" sourceNode="_r_5HcCk6Eem-J7NZSmLltA" targetNode="_r_kXUik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//NSDoc"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//NSDoc"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB22Vyk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB22WCk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB22WSk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB22XSk6Eem-J7NZSmLltA" sourceNode="_r_5HcCk6Eem-J7NZSmLltA" targetNode="_sAK0QCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//NSDoc"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//NSDoc"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB22Xik6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB22Xyk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB22YCk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB22ZCk6Eem-J7NZSmLltA" sourceNode="_r_9_8Ck6Eem-J7NZSmLltA" targetNode="_r_jJMSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceConstructedAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceConstructedAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB3dYCk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB3dYSk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB3dYik6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB3dZik6Eem-J7NZSmLltA" sourceNode="_r__OESk6Eem-J7NZSmLltA" targetNode="_r_s6MSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceDataAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceDataAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB3dZyk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB3daCk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB3daSk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB3dbSk6Eem-J7NZSmLltA" sourceNode="_sAAcMSk6Eem-J7NZSmLltA" targetNode="_r_kXUik6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNS"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNS"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB3dbik6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB3dbyk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB3dcCk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB3ddCk6Eem-J7NZSmLltA" sourceNode="_sAAcMSk6Eem-J7NZSmLltA" targetNode="_sAK0QCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNS"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNS"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB4EcCk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB4EcSk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB4Ecik6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB4Edik6Eem-J7NZSmLltA" sourceNode="_sACRYik6Eem-J7NZSmLltA" targetNode="_sAK0QCk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNsUsage"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceNsUsage"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB4Edyk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB4EeCk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB4EeSk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB4EfSk6Eem-J7NZSmLltA" sourceNode="_sADfgSk6Eem-J7NZSmLltA" targetNode="_r_s6MSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//ServiceParameter"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//ServiceParameter"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB4Efik6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB4Efyk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB4EgCk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB4EhCk6Eem-J7NZSmLltA" sourceNode="_sAGi0ik6Eem-J7NZSmLltA" targetNode="_r_s6MSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//SubDataAttribute"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//SubDataAttribute"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB4EhSk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB4Ehik6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB4Ehyk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB4rgyk6Eem-J7NZSmLltA" sourceNode="_sAIYASk6Eem-J7NZSmLltA" targetNode="_r_s6MSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//SubDataObject"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//SubDataObject"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB4rhCk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB4rhSk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB4rhik6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sB4riik6Eem-J7NZSmLltA" sourceNode="_sAJmICk6Eem-J7NZSmLltA" targetNode="_r_s6MSk6Eem-J7NZSmLltA">
+      <target xmi:type="ecore:EClass" href="nsd.ecore#//TitledClass"/>
+      <semanticElements xmi:type="ecore:EClass" href="nsd.ecore#//TitledClass"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sB4riyk6Eem-J7NZSmLltA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sB4rjCk6Eem-J7NZSmLltA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sB4rjSk6Eem-J7NZSmLltA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_rQwJgCk6Eem-J7NZSmLltA"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
+    <target xmi:type="ecore:EPackage" href="nsd.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.ecore b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.ecore
index d5bc0ede031d2f4538cd9d75443ba67a80640043..8c0d8995d1de70463924821e1710e516e8095453 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.ecore
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.ecore
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="nsd" nsURI="http://www.iec.ch/61850/2016/NSD" nsPrefix="nsd">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="&#xA;&#x9;&#x9;&#x9;COPYRIGHT (c) IEC, 2017. This version of this XSD is part of IEC 61850-7-7:2017; see the IEC 61850-7-7:2017 for full legal notices. In case of any differences between the here-below code and the IEC published content, the IEC published content remains the reference to be considered. The whole document has to be taken into account to have a full description of this code component.&#xA;&#x9;&#x9;See www.iec.ch/CCv1 for copyright details.&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;&#x9;&#x9;NameSpace Definition file syntax (NSD.xsd) for the machine processable format for tools.&#xA;&#x9;&#x9;&#x9;2017-08-28 (version 2017A).&#xA;&#x9;&#x9;&#x9;&#xA;&#x9;&#x9;&#x9;Describes in a machine-processable way selected components from the IEC 61850 data model.&#xA;&#x9;&#x9;&#x9;Four elements are defined:&#xA;&#x9;&#x9;&#x9;- NS: shall hold the namespace definition, all its documentation strings to be resolved in the sibling file (i.e., with same name but file extension &quot;NSDOC&quot;) with NSDoc as root. Shall have as file extension &quot;NSD&quot;.&#xA;&#x9;&#x9;&#x9;- ServiceNS: shall hold a service namespace definition, all its documentation strings to be resolved in the sibling file (i.e., with same name but file extension &quot;NSDOC&quot;) with NSDoc as root. Shall have as file extension &quot;SNSD&quot;.&#xA;&#x9;&#x9;&#x9;- NSDoc: shall hold all documentation strings defined in the sibling NS file. Shall have as file extension &quot;NSDOC&quot;.&#xA;&#x9;&#x9;&#x9;- ApplicableServiceNS: shall hold definition of link between NS and applicable ServiceNS. Shall have as file extension &quot;AppNS&quot;.&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;&#x9;&#x9;COPYRIGHT (c) IEC, 2017. This version of this XSD is part of IEC copyright definition.&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;&#x9;&#x9;Definition of elements used for copyright declaration in a code component XML file&#xA;&#x9;&#x9;&#x9;Draft 2016-11-23 (version 0.1).&#xA;&#x9;&#x9;&#x9;&#xA;&#x9;&#x9;&#x9;To be imported in other code component XSD to enable the usage of a copyright.&#xA;&#x9;&#x9;"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="AppliesToType">
+  <eClassifiers xsi:type="ecore:EClass" name="AppliesToType" eSuperTypes="#//NSDObjectWithVersionAndRelease">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="AppliesTo_._type"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="#//TNSIdentifier">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Identifier of the namespace, e.g., &quot;IEC 61850-7-4&quot;, &quot;(Tr)IEC 61850-90-4&quot;."/>
       </eAnnotations>
@@ -18,7 +15,7 @@
         <details key="name" value="id"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//TPubStage"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//PubStage"
         defaultValueLiteral="IS" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The publication stage of the namespace, by default IS."/>
@@ -28,17 +25,7 @@
         <details key="name" value="publicationStage"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="release" eType="#//TNSRelease"
-        defaultValueLiteral="1" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Release of the namespace version and revision, by default 1."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="release"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="#//TNSRevision"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="A" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Revision of the namespace version, by default 'A'."/>
@@ -48,23 +35,13 @@
         <details key="name" value="revision"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="#//TNSVersion" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Version (year) of the namespace."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DependsOnType">
+  <eClassifiers xsi:type="ecore:EClass" name="DependsOnType" eSuperTypes="#//NSDObjectWithVersionAndRelease">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="DependsOn_._type"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="#//TNSIdentifier">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Identifier of the namespace, e.g., &quot;IEC 61850-7-4&quot;, &quot;(Tr)IEC 61850-90-4&quot;."/>
       </eAnnotations>
@@ -73,7 +50,7 @@
         <details key="name" value="id"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//TPubStage"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//PubStage"
         defaultValueLiteral="IS" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The publication stage of the namespace, by default IS."/>
@@ -83,17 +60,7 @@
         <details key="name" value="publicationStage"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="release" eType="#//TNSRelease"
-        defaultValueLiteral="1" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Release of the namespace version and revision, by default 1."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="release"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="#//TNSRevision"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="A" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Revision of the namespace version, by default 'A'."/>
@@ -103,16 +70,6 @@
         <details key="name" value="revision"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="#//TNSVersion" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Version (year) of the namespace."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -143,7 +100,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="applicableServiceNS" upperBound="-2"
-        eType="#//TApplicableServiceNS" volatile="true" transient="true" derived="true"
+        eType="#//ApplicableServiceNS" volatile="true" transient="true" derived="true"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Root element of a file holding the allowed usages of ServiceNS-es."/>
@@ -155,7 +112,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="copyright" upperBound="-2"
-        eType="#//TCopyrightNotice" volatile="true" transient="true" derived="true"
+        eType="#//CopyrightNotice" volatile="true" transient="true" derived="true"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The copyright notice attached to the XML"/>
@@ -166,7 +123,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nS" upperBound="-2" eType="#//TNS"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="nS" upperBound="-2" eType="#//NS"
         volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Root element of a namespace definition (NSD) file."/>
@@ -178,7 +135,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="nSDoc" upperBound="-2"
-        eType="#//TNSDoc" volatile="true" transient="true" derived="true" containment="true"
+        eType="#//NSDoc" volatile="true" transient="true" derived="true" containment="true"
         resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Root element of a file holding the documentation strings of an NSD file (NSDOC)."/>
@@ -190,7 +147,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="serviceNS" upperBound="-2"
-        eType="#//TServiceNS" volatile="true" transient="true" derived="true" containment="true"
+        eType="#//ServiceNS" volatile="true" transient="true" derived="true" containment="true"
         resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Root element of a service namespace definition (SNSD) file."/>
@@ -207,7 +164,7 @@
       <details key="name" value="Service_._type"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TACSIServicesKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//ACSIServicesKind"
         unsettable="true">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
@@ -215,7 +172,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TAbbreviation">
+  <eClassifiers xsi:type="ecore:EClass" name="Abbreviation">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of an abbreviation."/>
     </eAnnotations>
@@ -223,7 +180,7 @@
       <details key="name" value="tAbbreviation"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to a full description of this abbreviation."/>
       </eAnnotations>
@@ -232,7 +189,7 @@
         <details key="name" value="descID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TAbbreviationName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the abbreviation, as used in IEC 61850 data models."/>
       </eAnnotations>
@@ -242,16 +199,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TAbbreviationName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Name of an abbreviation."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tAbbreviationName"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#normalizedString"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TAbbreviations">
+  <eClassifiers xsi:type="ecore:EClass" name="Abbreviations">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of abbreviationss which are introduced by a namespace."/>
     </eAnnotations>
@@ -260,7 +208,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="abbreviation" lowerBound="1"
-        upperBound="-1" eType="#//TAbbreviation" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//Abbreviation" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Definition of an abbreviation."/>
       </eAnnotations>
@@ -271,7 +219,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TAbstractLNClass" eSuperTypes="#//TAnyLNClass">
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractLNClass" eSuperTypes="#//AnyLNClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of an abstract logical node and its contents."/>
     </eAnnotations>
@@ -279,7 +227,7 @@
       <details key="name" value="tAbstractLNClass"/>
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TAbstractLNClassName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The name of the abstract logical node."/>
       </eAnnotations>
@@ -289,16 +237,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TAbstractLNClassName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Name of an abstract logical node."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tAbstractLNClassName"/>
-      <details key="baseType" value="tIec61850Name"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TACSIServicesKind">
+  <eClassifiers xsi:type="ecore:EEnum" name="ACSIServicesKind">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Enumeration holding the names of all ACSI services, as defined in Part 7-2. Is conceptually identical to the 7-2 ServiceNameKind enumeration (except the Unknown)."/>
     </eAnnotations>
@@ -365,13 +304,13 @@
     <eLiterals name="GetUsvReference" value="57"/>
     <eLiterals name="GetUSVElementNumber" value="58"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TACSIServicesKindObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
+  <eClassifiers xsi:type="ecore:EDataType" name="ACSIServicesKindObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="tACSIServicesKind:Object"/>
       <details key="baseType" value="tACSIServicesKind"/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TAnyLNClass" abstract="true" eSuperTypes="#//TTitledClass">
+  <eClassifiers xsi:type="ecore:EClass" name="AnyLNClass" abstract="true" eSuperTypes="#//TitledClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a logical node (abstract or not) and its contents."/>
     </eAnnotations>
@@ -380,7 +319,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataObject" upperBound="-1"
-        eType="#//TDataObject" containment="true" resolveProxies="false">
+        eType="#//DataObject" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Child Data Object of the logical node."/>
       </eAnnotations>
@@ -390,7 +329,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="base" eType="#//TAbstractLNClassName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="base" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the abstract LN class this one extends (directly)."/>
       </eAnnotations>
@@ -400,7 +339,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TApplicableServiceNS" eSuperTypes="#//TCopyrighted">
+  <eClassifiers xsi:type="ecore:EClass" name="ApplicableServiceNS" eSuperTypes="#//Copyrighted">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Describes the allowed usages of ServiceNS-es."/>
     </eAnnotations>
@@ -409,7 +348,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="serviceNsUsage" lowerBound="1"
-        upperBound="-1" eType="#//TServiceNsUsage" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//ServiceNsUsage" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Specification of a ServiceNS and all NS it can be used for."/>
       </eAnnotations>
@@ -440,7 +379,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TApplicableServices">
+  <eClassifiers xsi:type="ecore:EClass" name="ApplicableServices">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Applicable services for a given functional constraint."/>
     </eAnnotations>
@@ -460,7 +399,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataSetMemberOf" upperBound="-1"
-        eType="#//TDataSetMemberOf" containment="true" resolveProxies="false">
+        eType="#//DataSetMemberOf" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="An attribute of this FC can be member of a dataset for a control block type indicated by attribute cb if and only if this element is present."/>
       </eAnnotations>
@@ -471,16 +410,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TAttributeName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Name of a Data Attribute."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tAttributeName"/>
-      <details key="baseType" value="tIec61850Name"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TAttributeTypeKind" instanceClassName="org.eclipse.emf.common.util.Enumerator">
+  <eClassifiers xsi:type="ecore:EDataType" name="AttributeTypeKind" instanceClassName="org.eclipse.emf.common.util.Enumerator">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Type kind of a data attribute, which may be &quot;undefined&quot;."/>
     </eAnnotations>
@@ -489,7 +419,7 @@
       <details key="memberTypes" value="tDefinedAttributeTypeKind tUndefinedAttributeTypeKind"/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TBasicType">
+  <eClassifiers xsi:type="ecore:EClass" name="BasicType">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a basic type for a data attribute."/>
     </eAnnotations>
@@ -497,7 +427,7 @@
       <details key="name" value="tBasicType"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to a full description of this object."/>
       </eAnnotations>
@@ -506,7 +436,7 @@
         <details key="name" value="descID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TBasicTypeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the basic type (e.g., INT32), as used in SCL."/>
       </eAnnotations>
@@ -516,17 +446,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TBasicTypeName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Type describing the name of a basic type of a data attribute."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tBasicTypeName"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#token"/>
-      <details key="minLength" value="1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TBasicTypes">
+  <eClassifiers xsi:type="ecore:EClass" name="BasicTypes">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of basic types for data attributes introduced by a namespace."/>
     </eAnnotations>
@@ -535,7 +455,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="basicType" lowerBound="1"
-        upperBound="-1" eType="#//TBasicType" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//BasicType" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
         <details key="name" value="BasicType"/>
@@ -543,7 +463,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TCBKind">
+  <eClassifiers xsi:type="ecore:EEnum" name="CBKind">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Enumeration of control block kinds."/>
     </eAnnotations>
@@ -555,13 +475,13 @@
     <eLiterals name="GoCB" value="2"/>
     <eLiterals name="SVCB" value="3"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TCBKindObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
+  <eClassifiers xsi:type="ecore:EDataType" name="CBKindObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="tCBKind:Object"/>
       <details key="baseType" value="tCBKind"/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TCDC" eSuperTypes="#//TTitledClass">
+  <eClassifiers xsi:type="ecore:EClass" name="CDC" eSuperTypes="#//TitledClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a Common Data Class (CDC). It is always non-abstract."/>
     </eAnnotations>
@@ -570,7 +490,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="subDataObject" upperBound="-1"
-        eType="#//TSubDataObject" containment="true" resolveProxies="false">
+        eType="#//SubDataObject" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
         <details key="name" value="SubDataObject"/>
@@ -578,14 +498,14 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataAttribute" lowerBound="1"
-        upperBound="-1" eType="#//TDataAttribute" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//DataAttribute" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
         <details key="name" value="DataAttribute"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceParameter" eType="#//TServiceParameter"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceParameter" eType="#//ServiceParameter"
         containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
@@ -603,7 +523,7 @@
         <details key="name" value="enumParameterized"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TCDCName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the common data class."/>
       </eAnnotations>
@@ -643,17 +563,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TCDCName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Name of a Common Data Class (CDC)."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tCDCName"/>
-      <details key="baseType" value="tIec61850Name"/>
-      <details key="minLength" value="1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TCDCs">
+  <eClassifiers xsi:type="ecore:EClass" name="CDCs">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of CDCs introduced by a namespace."/>
     </eAnnotations>
@@ -661,7 +571,7 @@
       <details key="name" value="tCDCs"/>
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cDC" upperBound="-1" eType="#//TCDC"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="cDC" upperBound="-1" eType="#//CDC"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Definition of a common data class."/>
@@ -673,7 +583,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TChanges">
+  <eClassifiers xsi:type="ecore:EClass" name="Changes" eSuperTypes="#//NSDObjectWithVersionAndRelease">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Namespace history, e.g., which version it is based on and which TISSUES it includes since then."/>
     </eAnnotations>
@@ -681,7 +591,7 @@
       <details key="name" value="tChanges"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changesID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changesID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to a textual description of changes (not TISSUE list). Shall only be used for private namespaces."/>
       </eAnnotations>
@@ -699,17 +609,7 @@
         <details key="name" value="date"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="release" eType="#//TNSRelease"
-        defaultValueLiteral="1" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Release of the namespace this NSD file is based on, per default 1."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="release"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="#//TNSRevision"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="A" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Revision of the namespace this NSD file is based on, per default 'A'."/>
@@ -719,7 +619,7 @@
         <details key="name" value="revision"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tissues" eType="#//TissuesType">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tissues" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Comma-separated list of TISSUE numbers that were implemented since the previous namespace version/revision/release."/>
       </eAnnotations>
@@ -728,18 +628,8 @@
         <details key="name" value="tissues"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="#//TNSVersion" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Version of the namespace this NSD file is based on."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TConstructedAttribute" eSuperTypes="#//TTitledClass">
+  <eClassifiers xsi:type="ecore:EClass" name="ConstructedAttribute" eSuperTypes="#//TitledClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a constructed (structured) data attribute."/>
     </eAnnotations>
@@ -748,14 +638,14 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="subDataAttribute" lowerBound="1"
-        upperBound="-1" eType="#//TSubDataAttribute" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//SubDataAttribute" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
         <details key="name" value="SubDataAttribute"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the constructed (structured) data attribute."/>
       </eAnnotations>
@@ -765,7 +655,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TConstructedAttributes">
+  <eClassifiers xsi:type="ecore:EClass" name="ConstructedAttributes">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of Constructed Attributes introduced by a namespace."/>
     </eAnnotations>
@@ -774,7 +664,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="constructedAttribute" upperBound="-1"
-        eType="#//TConstructedAttribute" containment="true" resolveProxies="false">
+        eType="#//ConstructedAttribute" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Definition of a constructed (structured) data attribute."/>
       </eAnnotations>
@@ -785,7 +675,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TCopyrighted">
+  <eClassifiers xsi:type="ecore:EClass" name="Copyrighted">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Add description for a copyrighted XML."/>
     </eAnnotations>
@@ -793,7 +683,7 @@
       <details key="name" value="tCopyrighted"/>
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyright" eType="#//TCopyrightNotice"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="copyright" eType="#//CopyrightNotice"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The copyright notice attached to the XML"/>
@@ -805,7 +695,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TCopyrightNotice">
+  <eClassifiers xsi:type="ecore:EClass" name="CopyrightNotice">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Copyright notice definition."/>
     </eAnnotations>
@@ -814,7 +704,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="notice" lowerBound="1"
-        eType="#//TNotice" containment="true" resolveProxies="false">
+        eType="#//Notice" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The textual copyright notice."/>
       </eAnnotations>
@@ -825,7 +715,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="license" lowerBound="1"
-        eType="#//TLicense" containment="true" resolveProxies="false">
+        eType="#//License" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The license definition."/>
       </eAnnotations>
@@ -836,7 +726,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TDataAttribute" eSuperTypes="#//TDocumentedClass">
+  <eClassifiers xsi:type="ecore:EClass" name="DataAttribute" eSuperTypes="#//DocumentedClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a Data Attribute."/>
     </eAnnotations>
@@ -867,7 +757,7 @@
         <details key="name" value="dupd"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fc" lowerBound="1" eType="#//TFCAbbreviation">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fc" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Functional constraint of the data attribute."/>
       </eAnnotations>
@@ -886,7 +776,7 @@
         <details key="name" value="isArray"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxIndexAttribute" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxIndexAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the Attribute holding the maximal index of the array.&#xA;Is relevant information if and only if isArray=true. One and only one of sizeAttribute and maxIndexAttribute shall be used."/>
       </eAnnotations>
@@ -923,7 +813,7 @@
         <details key="name" value="minValue"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the data attribute."/>
       </eAnnotations>
@@ -932,7 +822,7 @@
         <details key="name" value="name"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="#//TPresenceConditionName"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="M" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Presence condition of the element. By default 'M' (mandatory)."/>
@@ -942,7 +832,7 @@
         <details key="name" value="presCond"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="#//TPresenceConditionArgument">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition. Can be a sibling element or a group number."/>
       </eAnnotations>
@@ -951,7 +841,7 @@
         <details key="name" value="presCondArgs"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition: a documentation identifier referring to some free text."/>
       </eAnnotations>
@@ -967,7 +857,7 @@
         <details key="name" value="qchg"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sizeAttribute" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sizeAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Sibling data attribute name holding the size of the array.&#xA;Is relevant information if and only if isArray=true. One and only one of sizeAttribute and maxIndexAttribute shall be used."/>
       </eAnnotations>
@@ -976,7 +866,7 @@
         <details key="name" value="sizeAttribute"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The type of the data attribute, e.g., the name of a basic type like INT32, the name of an enumeration of a constructed data attribute - depending on the sibling typeKind. If not provided, shall be defined by the &quot;parent&quot; element."/>
       </eAnnotations>
@@ -985,7 +875,7 @@
         <details key="name" value="type"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//TAttributeTypeKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//AttributeTypeKind"
         defaultValueLiteral="BASIC" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The kind of the data attribute's type. By  default, &quot;BASIC&quot;."/>
@@ -996,7 +886,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TDataObject" eSuperTypes="#//TDocumentedClass">
+  <eClassifiers xsi:type="ecore:EClass" name="DataObject" eSuperTypes="#//DocumentedClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a Data Object of a logical node."/>
     </eAnnotations>
@@ -1004,7 +894,7 @@
       <details key="name" value="tDataObject"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dsPresCond" eType="#//TPresenceConditionName"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dsPresCond" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="M" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Presence condition of the element. By default 'M' (mandatory)."/>
@@ -1014,7 +904,7 @@
         <details key="name" value="dsPresCond"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dsPresCondArgs" eType="#//TPresenceConditionArgument">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dsPresCondArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition. Can be a sibling element or a group number."/>
       </eAnnotations>
@@ -1023,7 +913,7 @@
         <details key="name" value="dsPresCondArgs"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dsPresCondArgsID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dsPresCondArgsID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition: a documentation identifier referring to some free text."/>
       </eAnnotations>
@@ -1032,7 +922,7 @@
         <details key="name" value="dsPresCondArgsID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TDataObjectName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the data object."/>
       </eAnnotations>
@@ -1041,7 +931,7 @@
         <details key="name" value="name"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="#//TPresenceConditionName"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="M" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Presence condition of the element. By default 'M' (mandatory)."/>
@@ -1051,7 +941,7 @@
         <details key="name" value="presCond"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="#//TPresenceConditionArgument">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition. Can be a sibling element or a group number."/>
       </eAnnotations>
@@ -1060,7 +950,7 @@
         <details key="name" value="presCondArgs"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition: a documentation identifier referring to some free text."/>
       </eAnnotations>
@@ -1079,7 +969,7 @@
         <details key="name" value="transient"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="#//TCDCName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Type of the data object, i.e., the name of the CDC."/>
       </eAnnotations>
@@ -1088,7 +978,7 @@
         <details key="name" value="type"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingType" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Type to be used for type-open CDCs, e.g., enumeration to be used for enumeration-based CDCs (e.g., ENS, ENC, ENG)."/>
       </eAnnotations>
@@ -1097,7 +987,7 @@
         <details key="name" value="underlyingType"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingTypeKind" eType="#//TDefinedAttributeTypeKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingTypeKind" eType="#//DefinedAttributeTypeKind"
         unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The typeKind to be used for all &quot;undefined&quot; attributes of the CDC of this DataObject."/>
@@ -1108,17 +998,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TDataObjectName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Name of a Data Object."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tDataObjectName"/>
-      <details key="baseType" value="tIec61850Name"/>
-      <details key="maxLength" value="12"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TDataSetMemberOf">
+  <eClassifiers xsi:type="ecore:EClass" name="DataSetMemberOf">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Indication of a given object can be a data set member of a given control block."/>
     </eAnnotations>
@@ -1126,7 +1006,7 @@
       <details key="name" value="tDataSetMemberOf"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cb" lowerBound="1" eType="#//TCBKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cb" lowerBound="1" eType="#//CBKind"
         unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Control block kind."/>
@@ -1137,7 +1017,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TDefinedAttributeTypeKind">
+  <eClassifiers xsi:type="ecore:EEnum" name="DefinedAttributeTypeKind">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Type kind of a data attribute."/>
     </eAnnotations>
@@ -1160,14 +1040,13 @@
       </eAnnotations>
     </eLiterals>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TDefinedAttributeTypeKindObject"
-      instanceClassName="org.eclipse.emf.common.util.Enumerator">
+  <eClassifiers xsi:type="ecore:EDataType" name="DefinedAttributeTypeKindObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="tDefinedAttributeTypeKind:Object"/>
       <details key="baseType" value="tDefinedAttributeTypeKind"/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TDoc">
+  <eClassifiers xsi:type="ecore:EClass" name="Doc">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A key-value pair for documentation. Attribute &quot;id&quot; is the key (the documentation string identifier) and the value of the element is the documentation string itself."/>
     </eAnnotations>
@@ -1201,7 +1080,7 @@
         <details key="group" value="#group:1"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Identifier of the documentation string."/>
       </eAnnotations>
@@ -1211,17 +1090,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TDocID" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Identifier referring to a documentation string, available in a sibling file."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tDocID"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#normalizedString"/>
-      <details key="minLength" value="1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TDocumentedClass">
+  <eClassifiers xsi:type="ecore:EClass" name="DocumentedClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A class with description."/>
     </eAnnotations>
@@ -1239,7 +1108,7 @@
         <details key="name" value="deprecated"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to a full description of this object."/>
       </eAnnotations>
@@ -1259,17 +1128,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TEmptyString" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The empty string."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tEmptyString"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#normalizedString"/>
-      <details key="maxLength" value="0"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TEnumeration" eSuperTypes="#//TTitledClass">
+  <eClassifiers xsi:type="ecore:EClass" name="Enumeration" eSuperTypes="#//TitledClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of an enumeration."/>
     </eAnnotations>
@@ -1278,14 +1137,14 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="literal" lowerBound="1"
-        upperBound="-1" eType="#//TLiteral" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//Literal" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
         <details key="name" value="Literal"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inheritedFrom" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inheritedFrom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the enumeration which is extended by the current enumeration."/>
       </eAnnotations>
@@ -1294,7 +1153,7 @@
         <details key="name" value="inheritedFrom"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the enumeration."/>
       </eAnnotations>
@@ -1304,7 +1163,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TEnumerations">
+  <eClassifiers xsi:type="ecore:EClass" name="Enumerations">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of Enumerations introduced by a namespace."/>
     </eAnnotations>
@@ -1313,7 +1172,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="enumeration" upperBound="-1"
-        eType="#//TEnumeration" containment="true" resolveProxies="false">
+        eType="#//Enumeration" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Definition of an enumeration."/>
       </eAnnotations>
@@ -1324,18 +1183,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TFCAbbreviation" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Functional Constraint abbreviation."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tFCAbbreviation"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#token"/>
-      <details key="minLength" value="1"/>
-      <details key="pattern" value="[\p{IsBasicLatin}]+"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TFunctionalConstraint">
+  <eClassifiers xsi:type="ecore:EClass" name="FunctionalConstraint">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a Functional Constraint."/>
     </eAnnotations>
@@ -1343,7 +1191,7 @@
       <details key="name" value="tFunctionalConstraint"/>
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="applicableServices" eType="#//TApplicableServices"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="applicableServices" eType="#//ApplicableServices"
         containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
@@ -1352,7 +1200,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="abbreviation" lowerBound="1"
-        eType="#//TFCAbbreviation">
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Abbreviated name of the FC (e.g., ST, MX, etc.)."/>
       </eAnnotations>
@@ -1361,7 +1209,7 @@
         <details key="name" value="abbreviation"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to a full description of this object."/>
       </eAnnotations>
@@ -1370,7 +1218,7 @@
         <details key="name" value="descID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="titleID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="titleID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to the title (alias) of this object."/>
       </eAnnotations>
@@ -1380,7 +1228,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TFunctionalConstraints">
+  <eClassifiers xsi:type="ecore:EClass" name="FunctionalConstraints">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of Functional Constraints introduced by a namespace."/>
     </eAnnotations>
@@ -1389,7 +1237,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="functionalConstraint" lowerBound="1"
-        upperBound="-1" eType="#//TFunctionalConstraint" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//FunctionalConstraint" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Definition of a Functional Constraint."/>
       </eAnnotations>
@@ -1400,29 +1248,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TIec61850Name" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tIec61850Name"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#Name"/>
-      <details key="minLength" value="1"/>
-      <details key="pattern" value="[\p{IsBasicLatin}\p{IsLatin-1Supplement}]+"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TIec61850NameString" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tIec61850NameString"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#normalizedString"/>
-      <details key="pattern" value="[\p{IsBasicLatin}\p{IsLatin-1Supplement}]+"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TissuesType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tissues_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#normalizedString"/>
-      <details key="minLength" value="1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TLicense">
+  <eClassifiers xsi:type="ecore:EClass" name="License">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Describe the license definition."/>
     </eAnnotations>
@@ -1437,7 +1263,7 @@
         <details key="name" value=":mixed"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//TLicenseKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//LicenseKind"
         unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="kind of license"/>
@@ -1457,7 +1283,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TLicenseKind">
+  <eClassifiers xsi:type="ecore:EEnum" name="LicenseKind">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Kind of license"/>
     </eAnnotations>
@@ -1468,13 +1294,13 @@
     <eLiterals name="Private" value="1"/>
     <eLiterals name="None" value="2"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TLicenseKindObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
+  <eClassifiers xsi:type="ecore:EDataType" name="LicenseKindObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="tLicenseKind:Object"/>
       <details key="baseType" value="tLicenseKind"/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TLiteral" eSuperTypes="#//TDocumentedClass">
+  <eClassifiers xsi:type="ecore:EClass" name="Literal" eSuperTypes="#//DocumentedClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a literal of an enumeration."/>
     </eAnnotations>
@@ -1492,7 +1318,7 @@
         <details key="name" value="literalVal"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TLiteralName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the enumeration's literal."/>
       </eAnnotations>
@@ -1502,18 +1328,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TLiteralName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Name of an enumeration literal. Maybe the empty string."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tLiteralName"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#normalizedString"/>
-      <details key="maxLength" value="127"/>
-      <details key="pattern" value="[\p{IsBasicLatin}\p{IsLatin-1Supplement}]*"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TLNClass" eSuperTypes="#//TAnyLNClass">
+  <eClassifiers xsi:type="ecore:EClass" name="LNClass" eSuperTypes="#//AnyLNClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a concrete (i.e., not abstract) logical node and its contents. At most one of &quot;base&quot; and &quot;isExtension&quot; shall be defined."/>
     </eAnnotations>
@@ -1541,7 +1356,7 @@
         <details key="name" value="isExtension"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TLNClassName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The logical node class name."/>
       </eAnnotations>
@@ -1551,7 +1366,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TLNClasses">
+  <eClassifiers xsi:type="ecore:EClass" name="LNClasses">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of LNClasses introduced by a namespace."/>
     </eAnnotations>
@@ -1560,7 +1375,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="abstractLNClass" upperBound="-1"
-        eType="#//TAbstractLNClass" containment="true" resolveProxies="false">
+        eType="#//AbstractLNClass" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Definition of an abstract logical node."/>
       </eAnnotations>
@@ -1571,7 +1386,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="lNClass" upperBound="-1"
-        eType="#//TLNClass" containment="true" resolveProxies="false">
+        eType="#//LNClass" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Definition of a (non-abstract) logical node."/>
       </eAnnotations>
@@ -1582,17 +1397,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TLNClassName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Name of a (non-abstract) logical node class."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tLNClassName"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#Name"/>
-      <details key="pattern" value="LLN0 [A-Z]{4}"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TNotice">
+  <eClassifiers xsi:type="ecore:EClass" name="Notice">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Textual notice"/>
     </eAnnotations>
@@ -1608,7 +1413,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TNS" eSuperTypes="#//TCopyrighted">
+  <eClassifiers xsi:type="ecore:EClass" name="NS" eSuperTypes="#//Copyrighted #//NSDObjectWithVersionAndRelease">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a namespace."/>
     </eAnnotations>
@@ -1616,7 +1421,7 @@
       <details key="name" value="tNS"/>
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="changes" eType="#//TChanges"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="changes" eType="#//Changes"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The version/revision/release this namespace is based on, including the TISSUEs implemented in this release."/>
@@ -1638,7 +1443,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="basicTypes" eType="#//TBasicTypes"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="basicTypes" eType="#//BasicTypes"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of basic types added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine &quot;included&quot; ones). Note: shall only be used in practice by the 7-2 namespace."/>
@@ -1650,7 +1455,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="functionalConstraints"
-        eType="#//TFunctionalConstraints" containment="true" resolveProxies="false">
+        eType="#//FunctionalConstraints" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of Functional Constraints added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine &quot;included&quot; ones)."/>
       </eAnnotations>
@@ -1660,7 +1465,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presenceConditions" eType="#//TPresenceConditions"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="presenceConditions" eType="#//PresenceConditions"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of presence conditions added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine &quot;included&quot; ones.)."/>
@@ -1671,7 +1476,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="abbreviations" eType="#//TAbbreviations"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="abbreviations" eType="#//Abbreviations"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of abbreviations added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine &quot;included&quot; ones.)."/>
@@ -1682,7 +1487,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="enumerations" eType="#//TEnumerations"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="enumerations" eType="#//Enumerations"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of Enumerations added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine &quot;included&quot; ones)."/>
@@ -1694,7 +1499,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="constructedAttributes"
-        eType="#//TConstructedAttributes" containment="true" resolveProxies="false">
+        eType="#//ConstructedAttributes" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of Constructed Attributes added by this namespace. Constructed Attributes are not allowed to be extended by another namespace. Note: shall only be used in practice by the 7-3"/>
       </eAnnotations>
@@ -1704,8 +1509,8 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cDCs" eType="#//TCDCs"
-        containment="true" resolveProxies="false">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="cDCs" eType="#//CDCs" containment="true"
+        resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of CDCs added by this namespace. CDCs are not allowed to be extended by another namespace. Note: shall only be used in practice by the 7-3"/>
       </eAnnotations>
@@ -1715,7 +1520,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="lNClasses" eType="#//TLNClasses"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lNClasses" eType="#//LNClasses"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of LNClasses added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine &quot;included&quot; ones)."/>
@@ -1726,7 +1531,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to a full description of this NS."/>
       </eAnnotations>
@@ -1735,7 +1540,7 @@
         <details key="name" value="descID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="#//TNSIdentifier">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Identifier of the namespace, e.g., &quot;IEC 61850-7-4&quot;, &quot;(Tr)IEC 61850-90-4&quot;."/>
       </eAnnotations>
@@ -1744,7 +1549,7 @@
         <details key="name" value="id"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//TPubStage"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//PubStage"
         defaultValueLiteral="IS" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The publication stage of the namespace, by default IS."/>
@@ -1754,17 +1559,7 @@
         <details key="name" value="publicationStage"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="release" eType="#//TNSRelease"
-        defaultValueLiteral="1" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Release of the namespace version and revision, by default 1."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="release"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="#//TNSRevision"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="A" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Revision of the namespace version, by default 'A'."/>
@@ -1783,7 +1578,7 @@
         <details key="name" value="umlDate"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlVersion" eType="#//TUMLVersion">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Version of UML from which this namespace definition file was generated from."/>
       </eAnnotations>
@@ -1792,18 +1587,8 @@
         <details key="name" value="umlVersion"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="#//TNSVersion" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Version (year) of the namespace."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TNSDoc" eSuperTypes="#//TCopyrighted">
+  <eClassifiers xsi:type="ecore:EClass" name="NSDoc" eSuperTypes="#//Copyrighted #//NSDObjectWithVersionAndRelease">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A non-empty list of tDoc elements."/>
     </eAnnotations>
@@ -1812,7 +1597,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="doc" lowerBound="1" upperBound="-1"
-        eType="#//TDoc" containment="true" resolveProxies="false">
+        eType="#//Doc" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of documentation identifiers and corresponding documentation strings in the corresponding language."/>
       </eAnnotations>
@@ -1822,7 +1607,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="#//TNSIdentifier">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Identifier of the namespace, e.g., &quot;IEC 61850-7-4&quot;, &quot;(Tr)IEC 61850-90-4&quot;."/>
       </eAnnotations>
@@ -1840,7 +1625,7 @@
         <details key="name" value="lang"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//TPubStage"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//PubStage"
         defaultValueLiteral="IS" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The publication stage of the namespace, by default IS."/>
@@ -1850,17 +1635,7 @@
         <details key="name" value="publicationStage"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="release" eType="#//TNSRelease"
-        defaultValueLiteral="1" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Release of the namespace version and revision, by default 1."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="release"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="#//TNSRevision"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="A" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Revision of the namespace version, by default 'A'."/>
@@ -1879,7 +1654,7 @@
         <details key="name" value="umlDate"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlVersion" eType="#//TUMLVersion">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Version of UML from which this namespace definition file was generated from."/>
       </eAnnotations>
@@ -1888,71 +1663,8 @@
         <details key="name" value="umlVersion"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="#//TNSVersion" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Version (year) of the namespace."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TNSIdentifier" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Identifier of a namespace."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tNSIdentifier"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#normalizedString"/>
-      <details key="pattern" value="\p{IsBasicLatin}+"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TNSRelease" instanceClassName="short">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Release of a namespace (number between 1 and 255), distinguishing between releases of a same namespace version and revision."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tNSRelease"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#unsignedByte"/>
-      <details key="minExclusive" value="0"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TNSReleaseObject" instanceClassName="java.lang.Short">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tNSRelease:Object"/>
-      <details key="baseType" value="tNSRelease"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TNSRevision" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Revision of a namespace (a basic latin upper-case letter), distinguishing between revisions of a same namespace version."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tNSRevision"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#token"/>
-      <details key="pattern" value="[A-Z]"/>
-    </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TNSVersion" instanceClassName="int">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Version of a namespace (a year between 2002 and 2099)."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tNSVersion"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#unsignedShort"/>
-      <details key="minInclusive" value="2002"/>
-      <details key="maxInclusive" value="2099"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TNSVersionObject" instanceClassName="java.lang.Integer">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tNSVersion:Object"/>
-      <details key="baseType" value="tNSVersion"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TPresenceCondition">
+  <eClassifiers xsi:type="ecore:EClass" name="PresenceCondition">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a presence condition."/>
     </eAnnotations>
@@ -1960,7 +1672,7 @@
       <details key="name" value="tPresenceCondition"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="argument" eType="#//TPresenceConditionArgument">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="argument" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The presence condition argument, if any."/>
       </eAnnotations>
@@ -1969,7 +1681,7 @@
         <details key="name" value="argument"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to a full description of this object."/>
       </eAnnotations>
@@ -1978,7 +1690,7 @@
         <details key="name" value="descID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TPresenceConditionName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the presence condition, as used in IEC 61850 data models."/>
       </eAnnotations>
@@ -1987,7 +1699,7 @@
         <details key="name" value="name"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="titleID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="titleID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to the title (alias) of this object."/>
       </eAnnotations>
@@ -1997,25 +1709,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TPresenceConditionArgument" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Argument to (some) presence conditions."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tPresenceConditionArgument"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#normalizedString"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TPresenceConditionName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Name of a presence condition of a child."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tPresenceConditionName"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#normalizedString"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TPresenceConditions">
+  <eClassifiers xsi:type="ecore:EClass" name="PresenceConditions">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of presence conditions which are introduced by a namespace."/>
     </eAnnotations>
@@ -2024,7 +1718,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="presenceCondition" lowerBound="1"
-        upperBound="-1" eType="#//TPresenceCondition" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//PresenceCondition" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Definition of a presence condition."/>
       </eAnnotations>
@@ -2035,7 +1729,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TPubStage">
+  <eClassifiers xsi:type="ecore:EEnum" name="PubStage">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Publication stage of the namespace."/>
     </eAnnotations>
@@ -2088,13 +1782,13 @@
       </eAnnotations>
     </eLiterals>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TPubStageObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
+  <eClassifiers xsi:type="ecore:EDataType" name="PubStageObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="tPubStage:Object"/>
       <details key="baseType" value="tPubStage"/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceCDC">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceCDC">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a CDC extension for control services."/>
     </eAnnotations>
@@ -2103,7 +1797,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="serviceDataAttribute" lowerBound="1"
-        upperBound="-1" eType="#//TServiceDataAttribute" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//ServiceDataAttribute" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Data attribute to be used as service parameter."/>
       </eAnnotations>
@@ -2113,7 +1807,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cdc" lowerBound="1" eType="#//TCDCName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cdc" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the common data class the service extension is for."/>
       </eAnnotations>
@@ -2132,7 +1826,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceCDCs">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceCDCs">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of Service CDCs introduced by a namespace."/>
     </eAnnotations>
@@ -2141,7 +1835,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="serviceCDC" upperBound="-1"
-        eType="#//TServiceCDC" containment="true" resolveProxies="false">
+        eType="#//ServiceCDC" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="CDC extensions for control in this service namespace."/>
       </eAnnotations>
@@ -2152,7 +1846,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceConstructedAttribute" eSuperTypes="#//TConstructedAttribute">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceConstructedAttribute" eSuperTypes="#//ConstructedAttribute">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a constructed attribute type for services."/>
     </eAnnotations>
@@ -2172,7 +1866,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceConstructedAttributes">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceConstructedAttributes">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of Service Constructed Attributes introduced by a namespace."/>
     </eAnnotations>
@@ -2181,7 +1875,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="serviceConstructedAttribute"
-        upperBound="-1" eType="#//TServiceConstructedAttribute" containment="true"
+        upperBound="-1" eType="#//ServiceConstructedAttribute" containment="true"
         resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Realization of Part 7-2 abstract types or constructed attributes needed for control services. Note: in SCL instance files, the ProtNs element shall be specified for these."/>
@@ -2193,7 +1887,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceDataAttribute" eSuperTypes="#//TDocumentedClass">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceDataAttribute" eSuperTypes="#//DocumentedClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a service parameter as Data Attribute."/>
     </eAnnotations>
@@ -2201,7 +1895,7 @@
       <details key="name" value="tServiceDataAttribute"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fc" lowerBound="1" eType="#//TFCAbbreviation">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fc" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Functional constraint of the data attribute."/>
       </eAnnotations>
@@ -2210,7 +1904,7 @@
         <details key="name" value="fc"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the data attribute."/>
       </eAnnotations>
@@ -2219,7 +1913,7 @@
         <details key="name" value="name"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="#//TPresenceConditionName"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="M" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Presence condition of the element. By default 'M' (mandatory)."/>
@@ -2229,7 +1923,7 @@
         <details key="name" value="presCond"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="#//TPresenceConditionArgument">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition. Can be a sibling element or a group number."/>
       </eAnnotations>
@@ -2238,7 +1932,7 @@
         <details key="name" value="presCondArgs"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition: a documentation identifier referring to some free text."/>
       </eAnnotations>
@@ -2247,7 +1941,7 @@
         <details key="name" value="presCondArgsID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The type of the data attribute, e.g., the name of a basic type like INT32, the name of an enumeration of a constructed data attribute - depending on the sibling typeKind. If not provided, shall be defined by the &quot;parent&quot; element."/>
       </eAnnotations>
@@ -2256,7 +1950,7 @@
         <details key="name" value="type"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//TAttributeTypeKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//AttributeTypeKind"
         defaultValueLiteral="BASIC" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The kind of the data attribute's type. By  default, &quot;BASIC&quot;."/>
@@ -2266,7 +1960,7 @@
         <details key="name" value="typeKind"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingType" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Type to be used for type-open CDCs, e.g., enumeration to be used for enumeration-based CDCs (e.g., ENS, ENC, ENG)."/>
       </eAnnotations>
@@ -2275,7 +1969,7 @@
         <details key="name" value="underlyingType"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingTypeKind" eType="#//TDefinedAttributeTypeKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingTypeKind" eType="#//DefinedAttributeTypeKind"
         unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The typeKind to be used for all &quot;undefined&quot; attributes of the CDC of this DataObject."/>
@@ -2286,7 +1980,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceNS" eSuperTypes="#//TCopyrighted">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceNS" eSuperTypes="#//Copyrighted #//NSDObjectWithVersionAndRelease">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a service namespace."/>
     </eAnnotations>
@@ -2294,7 +1988,7 @@
       <details key="name" value="tServiceNS"/>
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="changes" eType="#//TChanges"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="changes" eType="#//Changes"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The version/revision/release this namespace is based on, including the TISSUEs implemented in this release."/>
@@ -2306,7 +2000,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="functionalConstraints"
-        eType="#//TFunctionalConstraints" containment="true" resolveProxies="false">
+        eType="#//FunctionalConstraints" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of Functional Constraints added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine &quot;included&quot; ones.)."/>
       </eAnnotations>
@@ -2316,7 +2010,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presenceConditions" eType="#//TPresenceConditions"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="presenceConditions" eType="#//PresenceConditions"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of presence conditions added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine &quot;included&quot; ones.)."/>
@@ -2327,7 +2021,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="abbreviations" eType="#//TAbbreviations"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="abbreviations" eType="#//Abbreviations"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of abbreviations added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine &quot;included&quot; ones.)."/>
@@ -2339,7 +2033,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="serviceTypeRealizations"
-        eType="#//TServiceTypeRealizations" containment="true" resolveProxies="false">
+        eType="#//ServiceTypeRealizations" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of service type realization added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine &quot;included&quot; ones.)."/>
       </eAnnotations>
@@ -2350,7 +2044,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="serviceConstructedAttributes"
-        eType="#//TServiceConstructedAttributes" containment="true" resolveProxies="false">
+        eType="#//ServiceConstructedAttributes" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of service constructed attributes added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine &quot;included&quot; ones.)."/>
       </eAnnotations>
@@ -2360,7 +2054,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceCDCs" eType="#//TServiceCDCs"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceCDCs" eType="#//ServiceCDCs"
         containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="List of service CDCs added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine &quot;included&quot; ones.)."/>
@@ -2371,7 +2065,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to a full description of this NS."/>
       </eAnnotations>
@@ -2380,7 +2074,7 @@
         <details key="name" value="descID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="#//TNSIdentifier">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Identifier of the namespace, e.g., &quot;IEC 61850-7-4&quot;, &quot;(Tr)IEC 61850-90-4&quot;."/>
       </eAnnotations>
@@ -2389,7 +2083,7 @@
         <details key="name" value="id"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//TPubStage"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//PubStage"
         defaultValueLiteral="IS" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The publication stage of the namespace, by default IS."/>
@@ -2399,17 +2093,7 @@
         <details key="name" value="publicationStage"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="release" eType="#//TNSRelease"
-        defaultValueLiteral="1" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Release of the namespace version and revision, by default 1."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="release"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="#//TNSRevision"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="A" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Revision of the namespace version, by default 'A'."/>
@@ -2428,7 +2112,7 @@
         <details key="name" value="umlDate"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlVersion" eType="#//TUMLVersion">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Version of UML from which this namespace definition file was generated from."/>
       </eAnnotations>
@@ -2437,18 +2121,8 @@
         <details key="name" value="umlVersion"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="#//TNSVersion" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Version (year) of the namespace."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceNsUsage">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceNsUsage" eSuperTypes="#//NSDObjectWithVersionAndRelease">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Describes the list of (domain) NS for which a ServiceNS is applicable."/>
     </eAnnotations>
@@ -2467,7 +2141,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="#//TNSIdentifier">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Identifier of the namespace, e.g., &quot;IEC 61850-7-4&quot;, &quot;(Tr)IEC 61850-90-4&quot;."/>
       </eAnnotations>
@@ -2476,7 +2150,7 @@
         <details key="name" value="id"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//TPubStage"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationStage" eType="#//PubStage"
         defaultValueLiteral="IS" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The publication stage of the namespace, by default IS."/>
@@ -2486,17 +2160,7 @@
         <details key="name" value="publicationStage"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="release" eType="#//TNSRelease"
-        defaultValueLiteral="1" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Release of the namespace version and revision, by default 1."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="release"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="#//TNSRevision"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="A" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Revision of the namespace version, by default 'A'."/>
@@ -2506,18 +2170,8 @@
         <details key="name" value="revision"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="#//TNSVersion" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Version (year) of the namespace."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceParameter" eSuperTypes="#//TDocumentedClass">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceParameter" eSuperTypes="#//DocumentedClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of the service parameter for control services."/>
     </eAnnotations>
@@ -2552,7 +2206,7 @@
         <details key="name" value="minValue"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the data attribute."/>
       </eAnnotations>
@@ -2561,7 +2215,7 @@
         <details key="name" value="name"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The type of the data attribute, e.g., the name of a basic type like INT32, the name of an enumeration of a constructed data attribute - depending on the sibling typeKind. If not provided, shall be defined by the &quot;parent&quot; element."/>
       </eAnnotations>
@@ -2570,7 +2224,7 @@
         <details key="name" value="type"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//TAttributeTypeKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//AttributeTypeKind"
         defaultValueLiteral="BASIC" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The kind of the data attribute's type. By  default, &quot;BASIC&quot;."/>
@@ -2581,7 +2235,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceTypeRealization">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceTypeRealization">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of the realization of an abstract type as constructed attribute in the service namespace."/>
     </eAnnotations>
@@ -2589,7 +2243,7 @@
       <details key="name" value="tServiceTypeRealization"/>
       <details key="kind" value="empty"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fc" lowerBound="1" eType="#//TFCAbbreviation">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fc" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Functional constraint of the data attribute."/>
       </eAnnotations>
@@ -2598,7 +2252,7 @@
         <details key="name" value="fc"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the data attribute."/>
       </eAnnotations>
@@ -2607,7 +2261,7 @@
         <details key="name" value="name"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="#//TPresenceConditionName"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="M" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Presence condition of the element. By default 'M' (mandatory)."/>
@@ -2617,7 +2271,7 @@
         <details key="name" value="presCond"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="#//TPresenceConditionArgument">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition. Can be a sibling element or a group number."/>
       </eAnnotations>
@@ -2626,7 +2280,7 @@
         <details key="name" value="presCondArgs"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition: a documentation identifier referring to some free text."/>
       </eAnnotations>
@@ -2635,7 +2289,7 @@
         <details key="name" value="presCondArgsID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The type of the data attribute, e.g., the name of a basic type like INT32, the name of an enumeration of a constructed data attribute - depending on the sibling typeKind. If not provided, shall be defined by the &quot;parent&quot; element."/>
       </eAnnotations>
@@ -2644,7 +2298,7 @@
         <details key="name" value="type"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//TAttributeTypeKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//AttributeTypeKind"
         defaultValueLiteral="BASIC" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The kind of the data attribute's type. By  default, &quot;BASIC&quot;."/>
@@ -2655,7 +2309,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TServiceTypeRealizations">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceTypeRealizations">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="List of Service Type Realizations introduced by a namespace."/>
     </eAnnotations>
@@ -2664,7 +2318,7 @@
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="serviceTypeRealization"
-        upperBound="-1" eType="#//TConstructedAttribute" containment="true" resolveProxies="false">
+        upperBound="-1" eType="#//ConstructedAttribute" containment="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Realization of an abstract type as constructed attribute in the service namespace."/>
       </eAnnotations>
@@ -2675,7 +2329,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TSubDataAttribute" eSuperTypes="#//TDocumentedClass">
+  <eClassifiers xsi:type="ecore:EClass" name="SubDataAttribute" eSuperTypes="#//DocumentedClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a Sub Data Attribute (within a constructed data attribute)."/>
     </eAnnotations>
@@ -2702,7 +2356,7 @@
         <details key="name" value="isArray"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxIndexAttribute" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxIndexAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the Attribute holding the maximal index of the array.&#xA;Is relevant information if and only if isArray=true. One and only one of sizeAttribute and maxIndexAttribute shall be used."/>
       </eAnnotations>
@@ -2739,7 +2393,7 @@
         <details key="name" value="minValue"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the data attribute."/>
       </eAnnotations>
@@ -2748,7 +2402,7 @@
         <details key="name" value="name"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="#//TPresenceConditionName"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="M" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Presence condition of the element. By default 'M' (mandatory)."/>
@@ -2758,7 +2412,7 @@
         <details key="name" value="presCond"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="#//TPresenceConditionArgument">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition. Can be a sibling element or a group number."/>
       </eAnnotations>
@@ -2767,7 +2421,7 @@
         <details key="name" value="presCondArgs"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition: a documentation identifier referring to some free text."/>
       </eAnnotations>
@@ -2776,7 +2430,7 @@
         <details key="name" value="presCondArgsID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sizeAttribute" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sizeAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Sibling data attribute name holding the size of the array.&#xA;Is relevant information if and only if isArray=true. One and only one of sizeAttribute and maxIndexAttribute shall be used."/>
       </eAnnotations>
@@ -2785,7 +2439,7 @@
         <details key="name" value="sizeAttribute"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The type of the data attribute, e.g., the name of a basic type like INT32, the name of an enumeration of a constructed data attribute - depending on the sibling typeKind. If not provided, shall be defined by the &quot;parent&quot; element."/>
       </eAnnotations>
@@ -2794,7 +2448,7 @@
         <details key="name" value="type"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//TAttributeTypeKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeKind" eType="#//AttributeTypeKind"
         defaultValueLiteral="BASIC" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The kind of the data attribute's type. By  default, &quot;BASIC&quot;."/>
@@ -2805,7 +2459,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TSubDataObject" eSuperTypes="#//TDocumentedClass">
+  <eClassifiers xsi:type="ecore:EClass" name="SubDataObject" eSuperTypes="#//DocumentedClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Definition of a Sub-Data Object."/>
     </eAnnotations>
@@ -2823,7 +2477,7 @@
         <details key="name" value="isArray"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxIndexAttribute" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxIndexAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the Attribute holding the maximal index of the array.&#xA;Is relevant information if and only if isArray=true. One and only one of sizeAttribute and maxIndexAttribute shall be used."/>
       </eAnnotations>
@@ -2842,7 +2496,7 @@
         <details key="name" value="minIndex"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//TSubDataObjectName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Name of the Sub-Data Object."/>
       </eAnnotations>
@@ -2851,7 +2505,7 @@
         <details key="name" value="name"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="#//TPresenceConditionName"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCond" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="M" unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Presence condition of the element. By default 'M' (mandatory)."/>
@@ -2861,7 +2515,7 @@
         <details key="name" value="presCond"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="#//TPresenceConditionArgument">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition. Can be a sibling element or a group number."/>
       </eAnnotations>
@@ -2870,7 +2524,7 @@
         <details key="name" value="presCondArgs"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="#//TDocID">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presCondArgsID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional argument to the presence condition: a documentation identifier referring to some free text."/>
       </eAnnotations>
@@ -2879,7 +2533,7 @@
         <details key="name" value="presCondArgsID"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sizeAttribute" eType="#//TAttributeName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sizeAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Sibling data attribute name holding the size of the array.&#xA;Is relevant information if and only if isArray=true. One and only one of sizeAttribute and maxIndexAttribute shall be used."/>
       </eAnnotations>
@@ -2888,7 +2542,7 @@
         <details key="name" value="sizeAttribute"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="#//TCDCName">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Type of the SubDataObject, i.e., its CDC."/>
       </eAnnotations>
@@ -2897,7 +2551,7 @@
         <details key="name" value="type"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingType" eType="#//TIec61850Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Type to be used for type-open CDCs, e.g., enumeration to be used for enumeration-based CDCs (e.g., ENS, ENC, ENG)."/>
       </eAnnotations>
@@ -2906,7 +2560,7 @@
         <details key="name" value="underlyingType"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingTypeKind" eType="#//TDefinedAttributeTypeKind"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlyingTypeKind" eType="#//DefinedAttributeTypeKind"
         unsettable="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The typeKind to be used for all &quot;undefined&quot; attributes of the CDC of this DataObject."/>
@@ -2917,16 +2571,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TSubDataObjectName" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Name of a Sub-Data Object."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tSubDataObjectName"/>
-      <details key="baseType" value="tIec61850Name"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TTitledClass" eSuperTypes="#//TDocumentedClass">
+  <eClassifiers xsi:type="ecore:EClass" name="TitledClass" eSuperTypes="#//DocumentedClass">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A tDocumentedClass with title."/>
     </eAnnotations>
@@ -2935,7 +2580,7 @@
       <details key="kind" value="empty"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="titleID" lowerBound="1"
-        eType="#//TDocID">
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Documentation identifier referring to the title (alias) of this object."/>
       </eAnnotations>
@@ -2945,17 +2590,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TUMLVersion" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Version of the UML model used to generate this NSD."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="tUMLVersion"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#Name"/>
-      <details key="minLength" value="1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TUndefinedAttributeTypeKind">
+  <eClassifiers xsi:type="ecore:EEnum" name="UndefinedAttributeTypeKind">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Type kind for a data attribute which has its type &quot;undefined&quot;."/>
     </eAnnotations>
@@ -2968,11 +2603,28 @@
       </eAnnotations>
     </eLiterals>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TUndefinedAttributeTypeKindObject"
+  <eClassifiers xsi:type="ecore:EDataType" name="UndefinedAttributeTypeKindObject"
       instanceClassName="org.eclipse.emf.common.util.Enumerator">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="tUndefinedAttributeTypeKind:Object"/>
       <details key="baseType" value="tUndefinedAttributeTypeKind"/>
     </eAnnotations>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NSDObjectWithVersionAndRelease" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="release" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"
+        defaultValueLiteral="1" unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="release"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="version"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.genmodel b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.genmodel
index 8313f1615342c3db2de679533e34f9b9f81d48ac..2162aef8d339515a4b088b2b6a3ce27c81ddcd71 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.genmodel
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.genmodel
@@ -9,141 +9,113 @@
   <genPackages prefix="Nsd" basePackage="fr.centralesupelec.edf.riseclipse.iec61850"
       resource="XML" disposableProviderFactory="true" fileExtensions="nsd,snsd,nsdoc"
       ecorePackage="nsd.ecore#/" documentation="">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//TACSIServicesKind">
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/Associate"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/Abort"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/Release"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetServerDirectory"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetLogicalDeviceDirectory"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetAllDataValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetDataValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetDataValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetDataDirectory"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetDataDefinition"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetDataSetValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetDataSetValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/CreateDataSet"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/DeleteDataSet"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetDataSetDirectory"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SelectActiveSG"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SelectEditSG"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetEditSGValue"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/ConfirmEditSGValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetEditSGValue"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetSGCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/Report"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetBRCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetBRCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetURCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetURCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetLCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetLCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/QueryLogByTime"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/QueryLogAfter"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetLogStatusValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SendGOOSEMessage"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetGoCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetGoCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetGoReference"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetGOOSEElementNumber"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SendMSVMessage"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetMSVCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetMSVCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SendUSVMessage"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetUSVCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetUSVCBValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/Select"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SelectWithValue"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/Cancel"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/Operate"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/CommandTermination"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/TimeActivatedOperate"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetFile"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/SetFile"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/DeleteFile"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetFileAttributeValues"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/TimeSynchronization"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/InternalChange"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetLogicalNodeDirectory"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetMsvReference"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetMSVElementNumber"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetUsvReference"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TACSIServicesKind/GetUSVElementNumber"/>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//ACSIServicesKind">
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/Associate"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/Abort"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/Release"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetServerDirectory"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetLogicalDeviceDirectory"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetAllDataValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetDataValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetDataValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetDataDirectory"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetDataDefinition"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetDataSetValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetDataSetValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/CreateDataSet"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/DeleteDataSet"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetDataSetDirectory"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SelectActiveSG"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SelectEditSG"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetEditSGValue"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/ConfirmEditSGValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetEditSGValue"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetSGCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/Report"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetBRCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetBRCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetURCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetURCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetLCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetLCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/QueryLogByTime"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/QueryLogAfter"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetLogStatusValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SendGOOSEMessage"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetGoCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetGoCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetGoReference"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetGOOSEElementNumber"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SendMSVMessage"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetMSVCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetMSVCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SendUSVMessage"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetUSVCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetUSVCBValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/Select"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SelectWithValue"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/Cancel"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/Operate"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/CommandTermination"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/TimeActivatedOperate"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetFile"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/SetFile"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/DeleteFile"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetFileAttributeValues"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/TimeSynchronization"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/InternalChange"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetLogicalNodeDirectory"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetMsvReference"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetMSVElementNumber"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetUsvReference"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//ACSIServicesKind/GetUSVElementNumber"/>
     </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//TCBKind">
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TCBKind/RCB"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TCBKind/LCB"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TCBKind/GoCB"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TCBKind/SVCB"/>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//CBKind">
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//CBKind/RCB"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//CBKind/LCB"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//CBKind/GoCB"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//CBKind/SVCB"/>
     </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//TDefinedAttributeTypeKind">
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TDefinedAttributeTypeKind/BASIC"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TDefinedAttributeTypeKind/ENUMERATED"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TDefinedAttributeTypeKind/CONSTRUCTED"/>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//DefinedAttributeTypeKind">
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//DefinedAttributeTypeKind/BASIC"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//DefinedAttributeTypeKind/ENUMERATED"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//DefinedAttributeTypeKind/CONSTRUCTED"/>
     </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//TLicenseKind">
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TLicenseKind/Standard"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TLicenseKind/Private"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TLicenseKind/None"/>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//LicenseKind">
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//LicenseKind/Standard"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//LicenseKind/Private"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//LicenseKind/None"/>
     </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//TPubStage">
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TPubStage/WD"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TPubStage/CD"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TPubStage/CDV"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TPubStage/DTS"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TPubStage/DTR"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TPubStage/FDIS"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TPubStage/TS"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TPubStage/TR"/>
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TPubStage/IS"/>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//PubStage">
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//PubStage/WD"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//PubStage/CD"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//PubStage/CDV"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//PubStage/DTS"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//PubStage/DTR"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//PubStage/FDIS"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//PubStage/TS"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//PubStage/TR"/>
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//PubStage/IS"/>
     </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//TUndefinedAttributeTypeKind">
-      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//TUndefinedAttributeTypeKind/undefined"/>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="nsd.ecore#//UndefinedAttributeTypeKind">
+      <genEnumLiterals ecoreEnumLiteral="nsd.ecore#//UndefinedAttributeTypeKind/undefined"/>
     </genEnums>
-    <genDataTypes ecoreDataType="nsd.ecore#//TAbbreviationName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TAbstractLNClassName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TACSIServicesKindObject"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TAttributeName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TAttributeTypeKind"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TBasicTypeName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TCBKindObject"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TCDCName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TDataObjectName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TDefinedAttributeTypeKindObject"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TDocID"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TEmptyString"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TFCAbbreviation"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TIec61850Name"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TIec61850NameString"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TissuesType"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TLicenseKindObject"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TLiteralName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TLNClassName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TNSIdentifier"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TNSRelease"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TNSReleaseObject"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TNSRevision"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TNSVersion"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TNSVersionObject"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TPresenceConditionArgument"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TPresenceConditionName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TPubStageObject"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TSubDataObjectName"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TUMLVersion"/>
-    <genDataTypes ecoreDataType="nsd.ecore#//TUndefinedAttributeTypeKindObject"/>
+    <genDataTypes ecoreDataType="nsd.ecore#//ACSIServicesKindObject"/>
+    <genDataTypes ecoreDataType="nsd.ecore#//AttributeTypeKind"/>
+    <genDataTypes ecoreDataType="nsd.ecore#//CBKindObject"/>
+    <genDataTypes ecoreDataType="nsd.ecore#//DefinedAttributeTypeKindObject"/>
+    <genDataTypes ecoreDataType="nsd.ecore#//LicenseKindObject"/>
+    <genDataTypes ecoreDataType="nsd.ecore#//PubStageObject"/>
+    <genDataTypes ecoreDataType="nsd.ecore#//UndefinedAttributeTypeKindObject"/>
     <genClasses ecoreClass="nsd.ecore#//AppliesToType">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//AppliesToType/id"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//AppliesToType/publicationStage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//AppliesToType/release"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//AppliesToType/revision"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//AppliesToType/version"/>
     </genClasses>
     <genClasses ecoreClass="nsd.ecore#//DependsOnType">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DependsOnType/id"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DependsOnType/publicationStage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DependsOnType/release"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DependsOnType/revision"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DependsOnType/version"/>
     </genClasses>
     <genClasses ecoreClass="nsd.ecore#//DocumentRoot">
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DocumentRoot/mixed"/>
@@ -158,295 +130,289 @@
     <genClasses ecoreClass="nsd.ecore#//ServiceType">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceType/name"/>
     </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TAbbreviation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TAbbreviation/descID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TAbbreviation/name"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TAbbreviations">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TAbbreviations/abbreviation"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TAbstractLNClass">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TAbstractLNClass/name"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="nsd.ecore#//TAnyLNClass">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TAnyLNClass/dataObject"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TAnyLNClass/base"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TApplicableServiceNS">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TApplicableServiceNS/serviceNsUsage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TApplicableServiceNS/date"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TApplicableServiceNS/version"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TApplicableServices">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TApplicableServices/service"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TApplicableServices/dataSetMemberOf"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TBasicType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TBasicType/descID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TBasicType/name"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TBasicTypes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TBasicTypes/basicType"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TCDC">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TCDC/subDataObject"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TCDC/dataAttribute"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TCDC/serviceParameter"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TCDC/enumParameterized"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TCDC/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TCDC/statistics"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TCDC/typeKindParameterized"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TCDC/variant"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TCDCs">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TCDCs/cDC"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TChanges">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TChanges/changesID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TChanges/date"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TChanges/release"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TChanges/revision"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TChanges/tissues"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TChanges/version"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TConstructedAttribute">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TConstructedAttribute/subDataAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TConstructedAttribute/name"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TConstructedAttributes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TConstructedAttributes/constructedAttribute"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TCopyrighted">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TCopyrighted/copyright"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TCopyrightNotice">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TCopyrightNotice/notice"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TCopyrightNotice/license"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TDataAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/dchg"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/defaultValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/dupd"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/fc"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/isArray"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/maxIndexAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/maxValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/minIndex"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/minValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/presCond"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/presCondArgs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/presCondArgsID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/qchg"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/sizeAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataAttribute/typeKind"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TDataObject">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/dsPresCond"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/dsPresCondArgs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/dsPresCondArgsID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/presCond"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/presCondArgs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/presCondArgsID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/transient"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/underlyingType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataObject/underlyingTypeKind"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TDataSetMemberOf">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDataSetMemberOf/cb"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TDoc">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute nsd.ecore#//TDoc/mixed"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDoc/group"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDoc/any"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDoc/id"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TDocumentedClass">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDocumentedClass/deprecated"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDocumentedClass/descID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TDocumentedClass/informative"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TEnumeration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TEnumeration/literal"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TEnumeration/inheritedFrom"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TEnumeration/name"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TEnumerations">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TEnumerations/enumeration"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TFunctionalConstraint">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TFunctionalConstraint/applicableServices"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TFunctionalConstraint/abbreviation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TFunctionalConstraint/descID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TFunctionalConstraint/titleID"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TFunctionalConstraints">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TFunctionalConstraints/functionalConstraint"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TLicense">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute nsd.ecore#//TLicense/mixed"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TLicense/kind"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TLicense/uri"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TLiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TLiteral/literalVal"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TLiteral/name"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TLNClass">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TLNClass/canHaveLOG"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TLNClass/isExtension"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TLNClass/name"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TLNClasses">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TLNClasses/abstractLNClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TLNClasses/lNClass"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TNotice">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute nsd.ecore#//TNotice/mixed"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TNS">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/changes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/dependsOn"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/basicTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/functionalConstraints"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/presenceConditions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/abbreviations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/enumerations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/constructedAttributes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/cDCs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNS/lNClasses"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNS/descID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNS/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNS/publicationStage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNS/release"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNS/revision"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNS/umlDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNS/umlVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNS/version"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TNSDoc">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TNSDoc/doc"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNSDoc/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNSDoc/lang"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNSDoc/publicationStage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNSDoc/release"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNSDoc/revision"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNSDoc/umlDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNSDoc/umlVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TNSDoc/version"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TPresenceCondition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TPresenceCondition/argument"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TPresenceCondition/descID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TPresenceCondition/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TPresenceCondition/titleID"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TPresenceConditions">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TPresenceConditions/presenceCondition"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceCDC">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceCDC/serviceDataAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceCDC/cdc"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceCDC/variant"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceCDCs">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceCDCs/serviceCDC"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceConstructedAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceConstructedAttribute/typeKindParameterized"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceConstructedAttributes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceConstructedAttributes/serviceConstructedAttribute"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceDataAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceDataAttribute/fc"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceDataAttribute/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceDataAttribute/presCond"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceDataAttribute/presCondArgs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceDataAttribute/presCondArgsID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceDataAttribute/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceDataAttribute/typeKind"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceDataAttribute/underlyingType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceDataAttribute/underlyingTypeKind"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceNS">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceNS/changes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceNS/functionalConstraints"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceNS/presenceConditions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceNS/abbreviations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceNS/serviceTypeRealizations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceNS/serviceConstructedAttributes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceNS/serviceCDCs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNS/descID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNS/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNS/publicationStage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNS/release"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNS/revision"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNS/umlDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNS/umlVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNS/version"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceNsUsage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceNsUsage/appliesTo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNsUsage/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNsUsage/publicationStage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNsUsage/release"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNsUsage/revision"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceNsUsage/version"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceParameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceParameter/defaultValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceParameter/maxValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceParameter/minValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceParameter/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceParameter/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceParameter/typeKind"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceTypeRealization">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceTypeRealization/fc"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceTypeRealization/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceTypeRealization/presCond"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceTypeRealization/presCondArgs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceTypeRealization/presCondArgsID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceTypeRealization/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TServiceTypeRealization/typeKind"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TServiceTypeRealizations">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//TServiceTypeRealizations/serviceTypeRealization"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TSubDataAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/defaultValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/isArray"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/maxIndexAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/maxValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/minIndex"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/minValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/presCond"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/presCondArgs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/presCondArgsID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/sizeAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataAttribute/typeKind"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TSubDataObject">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/isArray"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/maxIndexAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/minIndex"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/presCond"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/presCondArgs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/presCondArgsID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/sizeAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/underlyingType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TSubDataObject/underlyingTypeKind"/>
-    </genClasses>
-    <genClasses ecoreClass="nsd.ecore#//TTitledClass">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TTitledClass/titleID"/>
+    <genClasses ecoreClass="nsd.ecore#//Abbreviation">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Abbreviation/descID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Abbreviation/name"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//Abbreviations">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//Abbreviations/abbreviation"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//AbstractLNClass">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//AbstractLNClass/name"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="nsd.ecore#//AnyLNClass">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//AnyLNClass/dataObject"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//AnyLNClass/base"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ApplicableServiceNS">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ApplicableServiceNS/serviceNsUsage"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ApplicableServiceNS/date"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ApplicableServiceNS/version"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ApplicableServices">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ApplicableServices/service"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ApplicableServices/dataSetMemberOf"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//BasicType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//BasicType/descID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//BasicType/name"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//BasicTypes">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//BasicTypes/basicType"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//CDC">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//CDC/subDataObject"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//CDC/dataAttribute"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//CDC/serviceParameter"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//CDC/enumParameterized"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//CDC/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//CDC/statistics"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//CDC/typeKindParameterized"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//CDC/variant"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//CDCs">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//CDCs/cDC"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//Changes">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Changes/changesID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Changes/date"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Changes/revision"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Changes/tissues"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ConstructedAttribute">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ConstructedAttribute/subDataAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ConstructedAttribute/name"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ConstructedAttributes">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ConstructedAttributes/constructedAttribute"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//Copyrighted">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//Copyrighted/copyright"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//CopyrightNotice">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//CopyrightNotice/notice"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//CopyrightNotice/license"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//DataAttribute">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/dchg"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/defaultValue"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/dupd"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/fc"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/isArray"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/maxIndexAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/maxValue"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/minIndex"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/minValue"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/presCond"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/presCondArgs"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/presCondArgsID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/qchg"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/sizeAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataAttribute/typeKind"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//DataObject">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/dsPresCond"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/dsPresCondArgs"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/dsPresCondArgsID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/presCond"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/presCondArgs"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/presCondArgsID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/transient"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/underlyingType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataObject/underlyingTypeKind"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//DataSetMemberOf">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DataSetMemberOf/cb"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//Doc">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute nsd.ecore#//Doc/mixed"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Doc/group"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Doc/any"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Doc/id"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//DocumentedClass">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DocumentedClass/deprecated"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DocumentedClass/descID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DocumentedClass/informative"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//Enumeration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//Enumeration/literal"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Enumeration/inheritedFrom"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Enumeration/name"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//Enumerations">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//Enumerations/enumeration"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//FunctionalConstraint">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraint/applicableServices"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//FunctionalConstraint/abbreviation"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//FunctionalConstraint/descID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//FunctionalConstraint/titleID"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//FunctionalConstraints">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraints/functionalConstraint"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//License">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute nsd.ecore#//License/mixed"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//License/kind"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//License/uri"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//Literal">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Literal/literalVal"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Literal/name"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//LNClass">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//LNClass/canHaveLOG"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//LNClass/isExtension"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//LNClass/name"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//LNClasses">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//LNClasses/abstractLNClass"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//LNClasses/lNClass"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//Notice">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute nsd.ecore#//Notice/mixed"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//NS">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/changes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/dependsOn"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/basicTypes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/functionalConstraints"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/presenceConditions"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/abbreviations"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/enumerations"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/constructedAttributes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/cDCs"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/lNClasses"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NS/descID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NS/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NS/publicationStage"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NS/revision"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NS/umlDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NS/umlVersion"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//NSDoc">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NSDoc/doc"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NSDoc/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NSDoc/lang"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NSDoc/publicationStage"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NSDoc/revision"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NSDoc/umlDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NSDoc/umlVersion"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//PresenceCondition">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//PresenceCondition/argument"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//PresenceCondition/descID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//PresenceCondition/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//PresenceCondition/titleID"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//PresenceConditions">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceConditions/presenceCondition"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceCDC">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceCDC/serviceDataAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceCDC/cdc"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceCDC/variant"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceCDCs">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceCDCs/serviceCDC"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceConstructedAttribute">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceConstructedAttribute/typeKindParameterized"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceConstructedAttributes">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceConstructedAttributes/serviceConstructedAttribute"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceDataAttribute">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceDataAttribute/fc"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceDataAttribute/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceDataAttribute/presCond"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceDataAttribute/presCondArgs"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceDataAttribute/presCondArgsID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceDataAttribute/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceDataAttribute/typeKind"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceDataAttribute/underlyingType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceDataAttribute/underlyingTypeKind"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceNS">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceNS/changes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceNS/functionalConstraints"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceNS/presenceConditions"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceNS/abbreviations"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceNS/serviceTypeRealizations"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceNS/serviceConstructedAttributes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceNS/serviceCDCs"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceNS/descID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceNS/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceNS/publicationStage"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceNS/revision"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceNS/umlDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceNS/umlVersion"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceNsUsage">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceNsUsage/appliesTo"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceNsUsage/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceNsUsage/publicationStage"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceNsUsage/revision"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceParameter">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceParameter/defaultValue"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceParameter/maxValue"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceParameter/minValue"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceParameter/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceParameter/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceParameter/typeKind"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceTypeRealization">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceTypeRealization/fc"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceTypeRealization/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceTypeRealization/presCond"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceTypeRealization/presCondArgs"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceTypeRealization/presCondArgsID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceTypeRealization/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//ServiceTypeRealization/typeKind"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//ServiceTypeRealizations">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//ServiceTypeRealizations/serviceTypeRealization"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//SubDataAttribute">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/defaultValue"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/isArray"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/maxIndexAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/maxValue"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/minIndex"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/minValue"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/presCond"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/presCondArgs"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/presCondArgsID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/sizeAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataAttribute/typeKind"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//SubDataObject">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/isArray"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/maxIndexAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/minIndex"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/presCond"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/presCondArgs"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/presCondArgsID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/sizeAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/underlyingType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//SubDataObject/underlyingTypeKind"/>
+    </genClasses>
+    <genClasses ecoreClass="nsd.ecore#//TitledClass">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TitledClass/titleID"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="nsd.ecore#//NSDObjectWithVersionAndRelease">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NSDObjectWithVersionAndRelease/release"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NSDObjectWithVersionAndRelease/version"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TACSIServicesKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ACSIServicesKind.java
similarity index 97%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TACSIServicesKind.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ACSIServicesKind.java
index b99f65d95e7f40265de2e80b4d458da6c1632895..8858f485edd9b0cbec8b36c6f5faa129c2c452dd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TACSIServicesKind.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ACSIServicesKind.java
@@ -27,17 +27,17 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>TACSI Services Kind</b></em>',
+ * A representation of the literals of the enumeration '<em><b>ACSI Services Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * Enumeration holding the names of all ACSI services, as defined in Part 7-2. Is conceptually identical to the 7-2 ServiceNameKind enumeration (except the Unknown).
  * <!-- end-model-doc -->
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTACSIServicesKind()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getACSIServicesKind()
  * @model extendedMetaData="name='tACSIServicesKind'"
  * @generated
  */
-public enum TACSIServicesKind implements Enumerator {
+public enum ACSIServicesKind implements Enumerator {
     /**
      * The '<em><b>Associate</b></em>' literal object.
      * <!-- begin-user-doc -->
@@ -1514,12 +1514,12 @@ public enum TACSIServicesKind implements Enumerator {
     public static final int GET_USV_ELEMENT_NUMBER_VALUE = 58;
 
     /**
-     * An array of all the '<em><b>TACSI Services Kind</b></em>' enumerators.
+     * An array of all the '<em><b>ACSI Services Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private static final TACSIServicesKind[] VALUES_ARRAY = new TACSIServicesKind[] { ASSOCIATE, ABORT, RELEASE,
+    private static final ACSIServicesKind[] VALUES_ARRAY = new ACSIServicesKind[] { ASSOCIATE, ABORT, RELEASE,
             GET_SERVER_DIRECTORY, GET_LOGICAL_DEVICE_DIRECTORY, GET_ALL_DATA_VALUES, GET_DATA_VALUES, SET_DATA_VALUES,
             GET_DATA_DIRECTORY, GET_DATA_DEFINITION, GET_DATA_SET_VALUES, SET_DATA_SET_VALUES, CREATE_DATA_SET,
             DELETE_DATA_SET, GET_DATA_SET_DIRECTORY, SELECT_ACTIVE_SG, SELECT_EDIT_SG, SET_EDIT_SG_VALUE,
@@ -1533,25 +1533,24 @@ public enum TACSIServicesKind implements Enumerator {
             GET_USV_ELEMENT_NUMBER, };
 
     /**
-     * A public read-only list of all the '<em><b>TACSI Services Kind</b></em>' enumerators.
+     * A public read-only list of all the '<em><b>ACSI Services Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List< TACSIServicesKind > VALUES = Collections
-            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
+    public static final List< ACSIServicesKind > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
-     * Returns the '<em><b>TACSI Services Kind</b></em>' literal with the specified literal value.
+     * Returns the '<em><b>ACSI Services Kind</b></em>' literal with the specified literal value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param literal the literal.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TACSIServicesKind get( String literal ) {
+    public static ACSIServicesKind get( String literal ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TACSIServicesKind result = VALUES_ARRAY[i];
+            ACSIServicesKind result = VALUES_ARRAY[i];
             if( result.toString().equals( literal ) ) {
                 return result;
             }
@@ -1560,16 +1559,16 @@ public enum TACSIServicesKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TACSI Services Kind</b></em>' literal with the specified name.
+     * Returns the '<em><b>ACSI Services Kind</b></em>' literal with the specified name.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param name the name.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TACSIServicesKind getByName( String name ) {
+    public static ACSIServicesKind getByName( String name ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TACSIServicesKind result = VALUES_ARRAY[i];
+            ACSIServicesKind result = VALUES_ARRAY[i];
             if( result.getName().equals( name ) ) {
                 return result;
             }
@@ -1578,14 +1577,14 @@ public enum TACSIServicesKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TACSI Services Kind</b></em>' literal with the specified integer value.
+     * Returns the '<em><b>ACSI Services Kind</b></em>' literal with the specified integer value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the integer value.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TACSIServicesKind get( int value ) {
+    public static ACSIServicesKind get( int value ) {
         switch( value ) {
         case ASSOCIATE_VALUE:
             return ASSOCIATE;
@@ -1736,7 +1735,7 @@ public enum TACSIServicesKind implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    private TACSIServicesKind( int value, String name, String literal ) {
+    private ACSIServicesKind( int value, String name, String literal ) {
         this.value = value;
         this.name = name;
         this.literal = literal;
@@ -1783,4 +1782,4 @@ public enum TACSIServicesKind implements Enumerator {
         return literal;
     }
 
-} //TACSIServicesKind
+} //ACSIServicesKind
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAbbreviation.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Abbreviation.java
similarity index 76%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAbbreviation.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Abbreviation.java
index 6a4be1e24b78d096beb6043d89202aec3deaefac..cf303875e3931ad0961b2d89cfd64cc383aaa4fd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAbbreviation.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Abbreviation.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TAbbreviation</b></em>'.
+ * A representation of the model object '<em><b>Abbreviation</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,15 +34,15 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation#getName <em>Name</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAbbreviation()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAbbreviation()
  * @model extendedMetaData="name='tAbbreviation' kind='empty'"
  * @generated
  */
-public interface TAbbreviation extends EObject {
+public interface Abbreviation extends EObject {
     /**
      * Returns the value of the '<em><b>Desc ID</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -52,15 +52,14 @@ public interface TAbbreviation extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Desc ID</em>' attribute.
      * @see #setDescID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAbbreviation_DescID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='descID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAbbreviation_DescID()
+     * @model extendedMetaData="kind='attribute' name='descID'"
      * @generated
      */
     String getDescID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation#getDescID <em>Desc ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation#getDescID <em>Desc ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Desc ID</em>' attribute.
@@ -78,15 +77,15 @@ public interface TAbbreviation extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAbbreviation_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviationName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAbbreviation_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -95,4 +94,4 @@ public interface TAbbreviation extends EObject {
      */
     void setName( String value );
 
-} // TAbbreviation
+} // Abbreviation
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAbbreviations.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Abbreviations.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAbbreviations.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Abbreviations.java
index 0a9681b201abeddb2081de25122ed57c3edc0ea9..d01cbfe388389892386b691e0e515ab49c6c70b8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAbbreviations.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Abbreviations.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TAbbreviations</b></em>'.
+ * A representation of the model object '<em><b>Abbreviations</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,28 +36,28 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations#getAbbreviation <em>Abbreviation</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations#getAbbreviation <em>Abbreviation</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAbbreviations()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAbbreviations()
  * @model extendedMetaData="name='tAbbreviations' kind='elementOnly'"
  * @generated
  */
-public interface TAbbreviations extends EObject {
+public interface Abbreviations extends EObject {
     /**
      * Returns the value of the '<em><b>Abbreviation</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Definition of an abbreviation.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Abbreviation</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAbbreviations_Abbreviation()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAbbreviations_Abbreviation()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='Abbreviation' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TAbbreviation > getAbbreviation();
+    EList< Abbreviation > getAbbreviation();
 
-} // TAbbreviations
+} // Abbreviations
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAbstractLNClass.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AbstractLNClass.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAbstractLNClass.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AbstractLNClass.java
index 732b5c5b3ba464a6598385e7577c5a90dc1d0441..7cd2accfb982a0182500b53b1a01a458721637fb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAbstractLNClass.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AbstractLNClass.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TAbstract LN Class</b></em>'.
+ * A representation of the model object '<em><b>Abstract LN Class</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -32,14 +32,14 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass#getName <em>Name</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAbstractLNClass()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAbstractLNClass()
  * @model extendedMetaData="name='tAbstractLNClass' kind='elementOnly'"
  * @generated
  */
-public interface TAbstractLNClass extends TAnyLNClass {
+public interface AbstractLNClass extends AnyLNClass {
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -49,15 +49,15 @@ public interface TAbstractLNClass extends TAnyLNClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAbstractLNClass_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClassName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAbstractLNClass_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -66,4 +66,4 @@ public interface TAbstractLNClass extends TAnyLNClass {
      */
     void setName( String value );
 
-} // TAbstractLNClass
+} // AbstractLNClass
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAnyLNClass.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AnyLNClass.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAnyLNClass.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AnyLNClass.java
index ae3ca5999c39f006d8c61ea3f6210c2876db2f06..b197973e24edcc81895c44a31a0d6715258fd0a7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TAnyLNClass.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AnyLNClass.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TAny LN Class</b></em>'.
+ * A representation of the model object '<em><b>Any LN Class</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,31 +34,31 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass#getDataObject <em>Data Object</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass#getBase <em>Base</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass#getDataObject <em>Data Object</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass#getBase <em>Base</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAnyLNClass()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAnyLNClass()
  * @model abstract="true"
  *        extendedMetaData="name='tAnyLNClass' kind='elementOnly'"
  * @generated
  */
-public interface TAnyLNClass extends TTitledClass {
+public interface AnyLNClass extends TitledClass {
     /**
      * Returns the value of the '<em><b>Data Object</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Child Data Object of the logical node.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Data Object</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAnyLNClass_DataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAnyLNClass_DataObject()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='DataObject' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TDataObject > getDataObject();
+    EList< DataObject > getDataObject();
 
     /**
      * Returns the value of the '<em><b>Base</b></em>' attribute.
@@ -69,15 +69,14 @@ public interface TAnyLNClass extends TTitledClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Base</em>' attribute.
      * @see #setBase(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTAnyLNClass_Base()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClassName"
-     *        extendedMetaData="kind='attribute' name='base'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAnyLNClass_Base()
+     * @model extendedMetaData="kind='attribute' name='base'"
      * @generated
      */
     String getBase();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass#getBase <em>Base</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass#getBase <em>Base</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Base</em>' attribute.
@@ -86,4 +85,4 @@ public interface TAnyLNClass extends TTitledClass {
      */
     void setBase( String value );
 
-} // TAnyLNClass
+} // AnyLNClass
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TApplicableServiceNS.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ApplicableServiceNS.java
similarity index 79%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TApplicableServiceNS.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ApplicableServiceNS.java
index f0ea44160a98777266176a8a91c85706043644cf..ca79a2d37ece2ec1ca9d88858ab1d5f383c69b82 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TApplicableServiceNS.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ApplicableServiceNS.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TApplicable Service NS</b></em>'.
+ * A representation of the model object '<em><b>Applicable Service NS</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,31 +36,31 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getServiceNsUsage <em>Service Ns Usage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getDate <em>Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getServiceNsUsage <em>Service Ns Usage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getDate <em>Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getVersion <em>Version</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTApplicableServiceNS()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getApplicableServiceNS()
  * @model extendedMetaData="name='tApplicableServiceNS' kind='elementOnly'"
  * @generated
  */
-public interface TApplicableServiceNS extends TCopyrighted {
+public interface ApplicableServiceNS extends Copyrighted {
     /**
      * Returns the value of the '<em><b>Service Ns Usage</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Specification of a ServiceNS and all NS it can be used for.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service Ns Usage</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTApplicableServiceNS_ServiceNsUsage()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getApplicableServiceNS_ServiceNsUsage()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='ServiceNsUsage' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TServiceNsUsage > getServiceNsUsage();
+    EList< ServiceNsUsage > getServiceNsUsage();
 
     /**
      * Returns the value of the '<em><b>Date</b></em>' attribute.
@@ -71,7 +71,7 @@ public interface TApplicableServiceNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Date</em>' attribute.
      * @see #setDate(XMLGregorianCalendar)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTApplicableServiceNS_Date()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getApplicableServiceNS_Date()
      * @model dataType="org.eclipse.emf.ecore.xml.type.DateTime" required="true"
      *        extendedMetaData="kind='attribute' name='date'"
      * @generated
@@ -79,7 +79,7 @@ public interface TApplicableServiceNS extends TCopyrighted {
     XMLGregorianCalendar getDate();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getDate <em>Date</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getDate <em>Date</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Date</em>' attribute.
@@ -99,7 +99,7 @@ public interface TApplicableServiceNS extends TCopyrighted {
      * @see #isSetVersion()
      * @see #unsetVersion()
      * @see #setVersion(long)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTApplicableServiceNS_Version()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getApplicableServiceNS_Version()
      * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.UnsignedInt" required="true"
      *        extendedMetaData="kind='attribute' name='version'"
      * @generated
@@ -107,7 +107,7 @@ public interface TApplicableServiceNS extends TCopyrighted {
     long getVersion();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getVersion <em>Version</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getVersion <em>Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Version</em>' attribute.
@@ -119,7 +119,7 @@ public interface TApplicableServiceNS extends TCopyrighted {
     void setVersion( long value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getVersion <em>Version</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getVersion <em>Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetVersion()
@@ -130,7 +130,7 @@ public interface TApplicableServiceNS extends TCopyrighted {
     void unsetVersion();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getVersion <em>Version</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getVersion <em>Version</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Version</em>' attribute is set.
@@ -141,4 +141,4 @@ public interface TApplicableServiceNS extends TCopyrighted {
      */
     boolean isSetVersion();
 
-} // TApplicableServiceNS
+} // ApplicableServiceNS
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TApplicableServices.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ApplicableServices.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TApplicableServices.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ApplicableServices.java
index 6a15e5382880ba26309779c7d60a0f092eca774c..74a82c6e8059bb533cd51e1a7fa59e020085c3aa 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TApplicableServices.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ApplicableServices.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TApplicable Services</b></em>'.
+ * A representation of the model object '<em><b>Applicable Services</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,15 +36,15 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices#getService <em>Service</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices#getDataSetMemberOf <em>Data Set Member Of</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices#getService <em>Service</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices#getDataSetMemberOf <em>Data Set Member Of</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTApplicableServices()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getApplicableServices()
  * @model extendedMetaData="name='tApplicableServices' kind='elementOnly'"
  * @generated
  */
-public interface TApplicableServices extends EObject {
+public interface ApplicableServices extends EObject {
     /**
      * Returns the value of the '<em><b>Service</b></em>' containment reference list.
      * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType}.
@@ -54,7 +54,7 @@ public interface TApplicableServices extends EObject {
      * If present, indicates that the service with given name applies to attributes with the specified FC (otherwise it may not be used).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTApplicableServices_Service()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getApplicableServices_Service()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='Service' namespace='##targetNamespace'"
      * @generated
@@ -63,18 +63,18 @@ public interface TApplicableServices extends EObject {
 
     /**
      * Returns the value of the '<em><b>Data Set Member Of</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * An attribute of this FC can be member of a dataset for a control block type indicated by attribute cb if and only if this element is present.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Data Set Member Of</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTApplicableServices_DataSetMemberOf()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getApplicableServices_DataSetMemberOf()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='DataSetMemberOf' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TDataSetMemberOf > getDataSetMemberOf();
+    EList< DataSetMemberOf > getDataSetMemberOf();
 
-} // TApplicableServices
+} // ApplicableServices
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AppliesToType.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AppliesToType.java
index 9786cf8d746a0a8d810b57af6f27500720882b1b..2b427bdb19459217a1295e1f976362047749bf98 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AppliesToType.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AppliesToType.java
@@ -19,8 +19,6 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Applies To Type</b></em>'.
@@ -32,16 +30,14 @@ import org.eclipse.emf.ecore.EObject;
  * <ul>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getId <em>Id</em>}</li>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRelease <em>Release</em>}</li>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getVersion <em>Version</em>}</li>
  * </ul>
  *
  * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAppliesToType()
  * @model extendedMetaData="name='AppliesTo_._type' kind='empty'"
  * @generated
  */
-public interface AppliesToType extends EObject {
+public interface AppliesToType extends NSDObjectWithVersionAndRelease {
     /**
      * Returns the value of the '<em><b>Id</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -52,7 +48,7 @@ public interface AppliesToType extends EObject {
      * @return the value of the '<em>Id</em>' attribute.
      * @see #setId(String)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAppliesToType_Id()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSIdentifier" required="true"
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='id'"
      * @generated
      */
@@ -71,36 +67,36 @@ public interface AppliesToType extends EObject {
     /**
      * Returns the value of the '<em><b>Publication Stage</b></em>' attribute.
      * The default value is <code>"IS"</code>.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * The publication stage of the namespace, by default IS.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAppliesToType_PublicationStage()
      * @model default="IS" unsettable="true"
      *        extendedMetaData="kind='attribute' name='publicationStage'"
      * @generated
      */
-    TPubStage getPublicationStage();
+    PubStage getPublicationStage();
 
     /**
      * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getPublicationStage <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
      * @generated
      */
-    void setPublicationStage( TPubStage value );
+    void setPublicationStage( PubStage value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getPublicationStage <em>Publication Stage</em>}' attribute.
@@ -108,7 +104,7 @@ public interface AppliesToType extends EObject {
      * <!-- end-user-doc -->
      * @see #isSetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     void unsetPublicationStage();
@@ -120,65 +116,11 @@ public interface AppliesToType extends EObject {
      * @return whether the value of the '<em>Publication Stage</em>' attribute is set.
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     boolean isSetPublicationStage();
 
-    /**
-     * Returns the value of the '<em><b>Release</b></em>' attribute.
-     * The default value is <code>"1"</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Release of the namespace version and revision, by default 1.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #setRelease(short)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAppliesToType_Release()
-     * @model default="1" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRelease"
-     *        extendedMetaData="kind='attribute' name='release'"
-     * @generated
-     */
-    short getRelease();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @generated
-     */
-    void setRelease( short value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    void unsetRelease();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRelease <em>Release</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Release</em>' attribute is set.
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    boolean isSetRelease();
-
     /**
      * Returns the value of the '<em><b>Revision</b></em>' attribute.
      * The default value is <code>"A"</code>.
@@ -192,7 +134,7 @@ public interface AppliesToType extends EObject {
      * @see #unsetRevision()
      * @see #setRevision(String)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAppliesToType_Revision()
-     * @model default="A" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRevision"
+     * @model default="A" unsettable="true"
      *        extendedMetaData="kind='attribute' name='revision'"
      * @generated
      */
@@ -233,57 +175,4 @@ public interface AppliesToType extends EObject {
      */
     boolean isSetRevision();
 
-    /**
-     * Returns the value of the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Version (year) of the namespace.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #setVersion(int)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAppliesToType_Version()
-     * @model unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSVersion" required="true"
-     *        extendedMetaData="kind='attribute' name='version'"
-     * @generated
-     */
-    int getVersion();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @generated
-     */
-    void setVersion( int value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    void unsetVersion();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getVersion <em>Version</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Version</em>' attribute is set.
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    boolean isSetVersion();
-
 } // AppliesToType
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TBasicType.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/BasicType.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TBasicType.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/BasicType.java
index 86e05738ef634367a1e45c960e002cf418c24f94..6a8bdf8bd3e47ef1ba36a0ce9821c03128835c10 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TBasicType.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/BasicType.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TBasic Type</b></em>'.
+ * A representation of the model object '<em><b>Basic Type</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,15 +34,15 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType#getName <em>Name</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTBasicType()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getBasicType()
  * @model extendedMetaData="name='tBasicType' kind='empty'"
  * @generated
  */
-public interface TBasicType extends EObject {
+public interface BasicType extends EObject {
     /**
      * Returns the value of the '<em><b>Desc ID</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -52,15 +52,14 @@ public interface TBasicType extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Desc ID</em>' attribute.
      * @see #setDescID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTBasicType_DescID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='descID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getBasicType_DescID()
+     * @model extendedMetaData="kind='attribute' name='descID'"
      * @generated
      */
     String getDescID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType#getDescID <em>Desc ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType#getDescID <em>Desc ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Desc ID</em>' attribute.
@@ -78,15 +77,15 @@ public interface TBasicType extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTBasicType_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypeName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getBasicType_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -95,4 +94,4 @@ public interface TBasicType extends EObject {
      */
     void setName( String value );
 
-} // TBasicType
+} // BasicType
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TBasicTypes.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/BasicTypes.java
similarity index 83%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TBasicTypes.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/BasicTypes.java
index 2e9178b5b870f309c1cc0e98c0ddfb3d8f9fd94f..3b57189fac8a61e6c5edf223a4fb487fcc0320c2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TBasicTypes.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/BasicTypes.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TBasic Types</b></em>'.
+ * A representation of the model object '<em><b>Basic Types</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,17 +36,17 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes#getBasicType <em>Basic Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes#getBasicType <em>Basic Type</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTBasicTypes()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getBasicTypes()
  * @model extendedMetaData="name='tBasicTypes' kind='elementOnly'"
  * @generated
  */
-public interface TBasicTypes extends EObject {
+public interface BasicTypes extends EObject {
     /**
      * Returns the value of the '<em><b>Basic Type</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType}.
      * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Basic Type</em>' containment reference list isn't clear,
@@ -54,11 +54,11 @@ public interface TBasicTypes extends EObject {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Basic Type</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTBasicTypes_BasicType()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getBasicTypes_BasicType()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='BasicType' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TBasicType > getBasicType();
+    EList< BasicType > getBasicType();
 
-} // TBasicTypes
+} // BasicTypes
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCBKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CBKind.java
similarity index 85%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCBKind.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CBKind.java
index 8853acf55dae52a426d0f6cb4bb2ba7814c2b35f..d9424ed91d5281c5b37814b1922c78020ac33904 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCBKind.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CBKind.java
@@ -27,17 +27,17 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>TCB Kind</b></em>',
+ * A representation of the literals of the enumeration '<em><b>CB Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * Enumeration of control block kinds.
  * <!-- end-model-doc -->
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCBKind()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCBKind()
  * @model extendedMetaData="name='tCBKind'"
  * @generated
  */
-public enum TCBKind implements Enumerator {
+public enum CBKind implements Enumerator {
     /**
      * The '<em><b>RCB</b></em>' literal object.
      * <!-- begin-user-doc -->
@@ -139,32 +139,32 @@ public enum TCBKind implements Enumerator {
     public static final int SVCB_VALUE = 3;
 
     /**
-     * An array of all the '<em><b>TCB Kind</b></em>' enumerators.
+     * An array of all the '<em><b>CB Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private static final TCBKind[] VALUES_ARRAY = new TCBKind[] { RCB, LCB, GO_CB, SVCB, };
+    private static final CBKind[] VALUES_ARRAY = new CBKind[] { RCB, LCB, GO_CB, SVCB, };
 
     /**
-     * A public read-only list of all the '<em><b>TCB Kind</b></em>' enumerators.
+     * A public read-only list of all the '<em><b>CB Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List< TCBKind > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
+    public static final List< CBKind > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
-     * Returns the '<em><b>TCB Kind</b></em>' literal with the specified literal value.
+     * Returns the '<em><b>CB Kind</b></em>' literal with the specified literal value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param literal the literal.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TCBKind get( String literal ) {
+    public static CBKind get( String literal ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TCBKind result = VALUES_ARRAY[i];
+            CBKind result = VALUES_ARRAY[i];
             if( result.toString().equals( literal ) ) {
                 return result;
             }
@@ -173,16 +173,16 @@ public enum TCBKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TCB Kind</b></em>' literal with the specified name.
+     * Returns the '<em><b>CB Kind</b></em>' literal with the specified name.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param name the name.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TCBKind getByName( String name ) {
+    public static CBKind getByName( String name ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TCBKind result = VALUES_ARRAY[i];
+            CBKind result = VALUES_ARRAY[i];
             if( result.getName().equals( name ) ) {
                 return result;
             }
@@ -191,14 +191,14 @@ public enum TCBKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TCB Kind</b></em>' literal with the specified integer value.
+     * Returns the '<em><b>CB Kind</b></em>' literal with the specified integer value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the integer value.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TCBKind get( int value ) {
+    public static CBKind get( int value ) {
         switch( value ) {
         case RCB_VALUE:
             return RCB;
@@ -239,7 +239,7 @@ public enum TCBKind implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    private TCBKind( int value, String name, String literal ) {
+    private CBKind( int value, String name, String literal ) {
         this.value = value;
         this.name = name;
         this.literal = literal;
@@ -286,4 +286,4 @@ public enum TCBKind implements Enumerator {
         return literal;
     }
 
-} //TCBKind
+} //CBKind
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCDC.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CDC.java
similarity index 80%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCDC.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CDC.java
index 288db8abf77c78ef344452ca963832ba58e0c273..fc3d8d7bf65b7d04a3d805fa14c825a0c7487cbc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCDC.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CDC.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TCDC</b></em>'.
+ * A representation of the model object '<em><b>CDC</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,24 +34,24 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getSubDataObject <em>Sub Data Object</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getDataAttribute <em>Data Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getServiceParameter <em>Service Parameter</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isEnumParameterized <em>Enum Parameterized</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isStatistics <em>Statistics</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getVariant <em>Variant</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getSubDataObject <em>Sub Data Object</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getDataAttribute <em>Data Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getServiceParameter <em>Service Parameter</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isEnumParameterized <em>Enum Parameterized</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isStatistics <em>Statistics</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getVariant <em>Variant</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDC()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDC()
  * @model extendedMetaData="name='tCDC' kind='elementOnly'"
  * @generated
  */
-public interface TCDC extends TTitledClass {
+public interface CDC extends TitledClass {
     /**
      * Returns the value of the '<em><b>Sub Data Object</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject}.
      * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Sub Data Object</em>' containment reference list isn't clear,
@@ -59,16 +59,16 @@ public interface TCDC extends TTitledClass {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Sub Data Object</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDC_SubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDC_SubDataObject()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='SubDataObject' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TSubDataObject > getSubDataObject();
+    EList< SubDataObject > getSubDataObject();
 
     /**
      * Returns the value of the '<em><b>Data Attribute</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute}.
      * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Data Attribute</em>' containment reference list isn't clear,
@@ -76,12 +76,12 @@ public interface TCDC extends TTitledClass {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Data Attribute</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDC_DataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDC_DataAttribute()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='DataAttribute' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TDataAttribute > getDataAttribute();
+    EList< DataAttribute > getDataAttribute();
 
     /**
      * Returns the value of the '<em><b>Service Parameter</b></em>' containment reference.
@@ -92,23 +92,23 @@ public interface TCDC extends TTitledClass {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Service Parameter</em>' containment reference.
-     * @see #setServiceParameter(TServiceParameter)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDC_ServiceParameter()
+     * @see #setServiceParameter(ServiceParameter)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDC_ServiceParameter()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ServiceParameter' namespace='##targetNamespace'"
      * @generated
      */
-    TServiceParameter getServiceParameter();
+    ServiceParameter getServiceParameter();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getServiceParameter <em>Service Parameter</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getServiceParameter <em>Service Parameter</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Service Parameter</em>' containment reference.
      * @see #getServiceParameter()
      * @generated
      */
-    void setServiceParameter( TServiceParameter value );
+    void setServiceParameter( ServiceParameter value );
 
     /**
      * Returns the value of the '<em><b>Enum Parameterized</b></em>' attribute.
@@ -122,7 +122,7 @@ public interface TCDC extends TTitledClass {
      * @see #isSetEnumParameterized()
      * @see #unsetEnumParameterized()
      * @see #setEnumParameterized(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDC_EnumParameterized()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDC_EnumParameterized()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='enumParameterized'"
      * @generated
@@ -130,7 +130,7 @@ public interface TCDC extends TTitledClass {
     boolean isEnumParameterized();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isEnumParameterized <em>Enum Parameterized</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isEnumParameterized <em>Enum Parameterized</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Enum Parameterized</em>' attribute.
@@ -142,7 +142,7 @@ public interface TCDC extends TTitledClass {
     void setEnumParameterized( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isEnumParameterized <em>Enum Parameterized</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isEnumParameterized <em>Enum Parameterized</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetEnumParameterized()
@@ -153,7 +153,7 @@ public interface TCDC extends TTitledClass {
     void unsetEnumParameterized();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isEnumParameterized <em>Enum Parameterized</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isEnumParameterized <em>Enum Parameterized</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Enum Parameterized</em>' attribute is set.
@@ -173,15 +173,15 @@ public interface TCDC extends TTitledClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDC_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDC_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -202,7 +202,7 @@ public interface TCDC extends TTitledClass {
      * @see #isSetStatistics()
      * @see #unsetStatistics()
      * @see #setStatistics(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDC_Statistics()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDC_Statistics()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='statistics'"
      * @generated
@@ -210,7 +210,7 @@ public interface TCDC extends TTitledClass {
     boolean isStatistics();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isStatistics <em>Statistics</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isStatistics <em>Statistics</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Statistics</em>' attribute.
@@ -222,7 +222,7 @@ public interface TCDC extends TTitledClass {
     void setStatistics( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isStatistics <em>Statistics</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isStatistics <em>Statistics</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetStatistics()
@@ -233,7 +233,7 @@ public interface TCDC extends TTitledClass {
     void unsetStatistics();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isStatistics <em>Statistics</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isStatistics <em>Statistics</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Statistics</em>' attribute is set.
@@ -257,7 +257,7 @@ public interface TCDC extends TTitledClass {
      * @see #isSetTypeKindParameterized()
      * @see #unsetTypeKindParameterized()
      * @see #setTypeKindParameterized(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDC_TypeKindParameterized()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDC_TypeKindParameterized()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='typeKindParameterized'"
      * @generated
@@ -265,7 +265,7 @@ public interface TCDC extends TTitledClass {
     boolean isTypeKindParameterized();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type Kind Parameterized</em>' attribute.
@@ -277,7 +277,7 @@ public interface TCDC extends TTitledClass {
     void setTypeKindParameterized( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetTypeKindParameterized()
@@ -288,7 +288,7 @@ public interface TCDC extends TTitledClass {
     void unsetTypeKindParameterized();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Type Kind Parameterized</em>' attribute is set.
@@ -308,7 +308,7 @@ public interface TCDC extends TTitledClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Variant</em>' attribute.
      * @see #setVariant(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDC_Variant()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDC_Variant()
      * @model dataType="org.eclipse.emf.ecore.xml.type.Token"
      *        extendedMetaData="kind='attribute' name='variant'"
      * @generated
@@ -316,7 +316,7 @@ public interface TCDC extends TTitledClass {
     String getVariant();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getVariant <em>Variant</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getVariant <em>Variant</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Variant</em>' attribute.
@@ -325,4 +325,4 @@ public interface TCDC extends TTitledClass {
      */
     void setVariant( String value );
 
-} // TCDC
+} // CDC
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCDCs.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CDCs.java
similarity index 84%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCDCs.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CDCs.java
index 24f14c1cb8a43fa425a3a6d1013df07bbb101768..a87bae64105bb9803dd74133590d08f8c6fe4720 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCDCs.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CDCs.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TCD Cs</b></em>'.
+ * A representation of the model object '<em><b>CD Cs</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,28 +36,28 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs#getCDC <em>CDC</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs#getCDC <em>CDC</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDCs()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDCs()
  * @model extendedMetaData="name='tCDCs' kind='elementOnly'"
  * @generated
  */
-public interface TCDCs extends EObject {
+public interface CDCs extends EObject {
     /**
      * Returns the value of the '<em><b>CDC</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Definition of a common data class.
      * <!-- end-model-doc -->
      * @return the value of the '<em>CDC</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCDCs_CDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCDCs_CDC()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='CDC' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TCDC > getCDC();
+    EList< CDC > getCDC();
 
-} // TCDCs
+} // CDCs
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Changes.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Changes.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b11ca317e18176116a6d7a5012bb6574ead60b0
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Changes.java
@@ -0,0 +1,178 @@
+/**
+ *  Copyright (c) 2019 CentraleSupélec & EDF.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ * 
+ */
+package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Changes</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Namespace history, e.g., which version it is based on and which TISSUES it includes since then.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getChangesID <em>Changes ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getDate <em>Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getRevision <em>Revision</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getTissues <em>Tissues</em>}</li>
+ * </ul>
+ *
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getChanges()
+ * @model extendedMetaData="name='tChanges' kind='empty'"
+ * @generated
+ */
+public interface Changes extends NSDObjectWithVersionAndRelease {
+    /**
+     * Returns the value of the '<em><b>Changes ID</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * Documentation identifier referring to a textual description of changes (not TISSUE list). Shall only be used for private namespaces.
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Changes ID</em>' attribute.
+     * @see #setChangesID(String)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getChanges_ChangesID()
+     * @model extendedMetaData="kind='attribute' name='changesID'"
+     * @generated
+     */
+    String getChangesID();
+
+    /**
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getChangesID <em>Changes ID</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Changes ID</em>' attribute.
+     * @see #getChangesID()
+     * @generated
+     */
+    void setChangesID( String value );
+
+    /**
+     * Returns the value of the '<em><b>Date</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * The date since the Tissues have been logged.
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Date</em>' attribute.
+     * @see #setDate(XMLGregorianCalendar)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getChanges_Date()
+     * @model dataType="org.eclipse.emf.ecore.xml.type.Date"
+     *        extendedMetaData="kind='attribute' name='date'"
+     * @generated
+     */
+    XMLGregorianCalendar getDate();
+
+    /**
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getDate <em>Date</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Date</em>' attribute.
+     * @see #getDate()
+     * @generated
+     */
+    void setDate( XMLGregorianCalendar value );
+
+    /**
+     * Returns the value of the '<em><b>Revision</b></em>' attribute.
+     * The default value is <code>"A"</code>.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * Revision of the namespace this NSD file is based on, per default 'A'.
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Revision</em>' attribute.
+     * @see #isSetRevision()
+     * @see #unsetRevision()
+     * @see #setRevision(String)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getChanges_Revision()
+     * @model default="A" unsettable="true"
+     *        extendedMetaData="kind='attribute' name='revision'"
+     * @generated
+     */
+    String getRevision();
+
+    /**
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getRevision <em>Revision</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Revision</em>' attribute.
+     * @see #isSetRevision()
+     * @see #unsetRevision()
+     * @see #getRevision()
+     * @generated
+     */
+    void setRevision( String value );
+
+    /**
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getRevision <em>Revision</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isSetRevision()
+     * @see #getRevision()
+     * @see #setRevision(String)
+     * @generated
+     */
+    void unsetRevision();
+
+    /**
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getRevision <em>Revision</em>}' attribute is set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return whether the value of the '<em>Revision</em>' attribute is set.
+     * @see #unsetRevision()
+     * @see #getRevision()
+     * @see #setRevision(String)
+     * @generated
+     */
+    boolean isSetRevision();
+
+    /**
+     * Returns the value of the '<em><b>Tissues</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * Comma-separated list of TISSUE numbers that were implemented since the previous namespace version/revision/release.
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Tissues</em>' attribute.
+     * @see #setTissues(String)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getChanges_Tissues()
+     * @model extendedMetaData="kind='attribute' name='tissues'"
+     * @generated
+     */
+    String getTissues();
+
+    /**
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getTissues <em>Tissues</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Tissues</em>' attribute.
+     * @see #getTissues()
+     * @generated
+     */
+    void setTissues( String value );
+
+} // Changes
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TConstructedAttribute.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ConstructedAttribute.java
similarity index 76%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TConstructedAttribute.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ConstructedAttribute.java
index b10065927fe7f12a1669b6434a42cba0f18323f5..ccf9dea5f5a3800428d669c8c8c992d289de1f72 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TConstructedAttribute.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ConstructedAttribute.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TConstructed Attribute</b></em>'.
+ * A representation of the model object '<em><b>Constructed Attribute</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,18 +34,18 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute#getSubDataAttribute <em>Sub Data Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute#getSubDataAttribute <em>Sub Data Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute#getName <em>Name</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTConstructedAttribute()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getConstructedAttribute()
  * @model extendedMetaData="name='tConstructedAttribute' kind='elementOnly'"
  * @generated
  */
-public interface TConstructedAttribute extends TTitledClass {
+public interface ConstructedAttribute extends TitledClass {
     /**
      * Returns the value of the '<em><b>Sub Data Attribute</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute}.
      * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Sub Data Attribute</em>' containment reference list isn't clear,
@@ -53,12 +53,12 @@ public interface TConstructedAttribute extends TTitledClass {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Sub Data Attribute</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTConstructedAttribute_SubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getConstructedAttribute_SubDataAttribute()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='SubDataAttribute' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TSubDataAttribute > getSubDataAttribute();
+    EList< SubDataAttribute > getSubDataAttribute();
 
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -69,15 +69,15 @@ public interface TConstructedAttribute extends TTitledClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTConstructedAttribute_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getConstructedAttribute_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -86,4 +86,4 @@ public interface TConstructedAttribute extends TTitledClass {
      */
     void setName( String value );
 
-} // TConstructedAttribute
+} // ConstructedAttribute
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TConstructedAttributes.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ConstructedAttributes.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TConstructedAttributes.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ConstructedAttributes.java
index 47e501167d8455117b71faa6e0eda5b7bd372aab..2370fbe953d942733ebb51957cd0dc3d04c13529 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TConstructedAttributes.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ConstructedAttributes.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TConstructed Attributes</b></em>'.
+ * A representation of the model object '<em><b>Constructed Attributes</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,28 +36,28 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes#getConstructedAttribute <em>Constructed Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes#getConstructedAttribute <em>Constructed Attribute</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTConstructedAttributes()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getConstructedAttributes()
  * @model extendedMetaData="name='tConstructedAttributes' kind='elementOnly'"
  * @generated
  */
-public interface TConstructedAttributes extends EObject {
+public interface ConstructedAttributes extends EObject {
     /**
      * Returns the value of the '<em><b>Constructed Attribute</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Definition of a constructed (structured) data attribute.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Constructed Attribute</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTConstructedAttributes_ConstructedAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getConstructedAttributes_ConstructedAttribute()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ConstructedAttribute' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TConstructedAttribute > getConstructedAttribute();
+    EList< ConstructedAttribute > getConstructedAttribute();
 
-} // TConstructedAttributes
+} // ConstructedAttributes
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCopyrightNotice.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CopyrightNotice.java
similarity index 76%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCopyrightNotice.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CopyrightNotice.java
index 389beb7eeeb5597083bcfad4672360c229eabc54..83a8224a1cbe6d5eb23962ca570604b3447b69dd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCopyrightNotice.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CopyrightNotice.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TCopyright Notice</b></em>'.
+ * A representation of the model object '<em><b>Copyright Notice</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,15 +34,15 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice#getNotice <em>Notice</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice#getLicense <em>License</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice#getNotice <em>Notice</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice#getLicense <em>License</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCopyrightNotice()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCopyrightNotice()
  * @model extendedMetaData="name='tCopyrightNotice' kind='elementOnly'"
  * @generated
  */
-public interface TCopyrightNotice extends EObject {
+public interface CopyrightNotice extends EObject {
     /**
      * Returns the value of the '<em><b>Notice</b></em>' containment reference.
      * <!-- begin-user-doc -->
@@ -51,23 +51,23 @@ public interface TCopyrightNotice extends EObject {
      * The textual copyright notice.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Notice</em>' containment reference.
-     * @see #setNotice(TNotice)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCopyrightNotice_Notice()
+     * @see #setNotice(Notice)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCopyrightNotice_Notice()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='Notice' namespace='##targetNamespace'"
      * @generated
      */
-    TNotice getNotice();
+    Notice getNotice();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice#getNotice <em>Notice</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice#getNotice <em>Notice</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Notice</em>' containment reference.
      * @see #getNotice()
      * @generated
      */
-    void setNotice( TNotice value );
+    void setNotice( Notice value );
 
     /**
      * Returns the value of the '<em><b>License</b></em>' containment reference.
@@ -77,22 +77,22 @@ public interface TCopyrightNotice extends EObject {
      * The license definition.
      * <!-- end-model-doc -->
      * @return the value of the '<em>License</em>' containment reference.
-     * @see #setLicense(TLicense)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCopyrightNotice_License()
+     * @see #setLicense(License)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCopyrightNotice_License()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='License' namespace='##targetNamespace'"
      * @generated
      */
-    TLicense getLicense();
+    License getLicense();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice#getLicense <em>License</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice#getLicense <em>License</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>License</em>' containment reference.
      * @see #getLicense()
      * @generated
      */
-    void setLicense( TLicense value );
+    void setLicense( License value );
 
-} // TCopyrightNotice
+} // CopyrightNotice
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCopyrighted.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Copyrighted.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCopyrighted.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Copyrighted.java
index a092b8f3ed6c7bcb0c11e1fb15abba22f7beb98f..3f0d20ff12c1c03b6d8e1a4c316d1014ef49197a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TCopyrighted.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Copyrighted.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TCopyrighted</b></em>'.
+ * A representation of the model object '<em><b>Copyrighted</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,14 +34,14 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted#getCopyright <em>Copyright</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted#getCopyright <em>Copyright</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCopyrighted()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCopyrighted()
  * @model extendedMetaData="name='tCopyrighted' kind='elementOnly'"
  * @generated
  */
-public interface TCopyrighted extends EObject {
+public interface Copyrighted extends EObject {
     /**
      * Returns the value of the '<em><b>Copyright</b></em>' containment reference.
      * <!-- begin-user-doc -->
@@ -50,22 +50,22 @@ public interface TCopyrighted extends EObject {
      * The copyright notice attached to the XML
      * <!-- end-model-doc -->
      * @return the value of the '<em>Copyright</em>' containment reference.
-     * @see #setCopyright(TCopyrightNotice)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTCopyrighted_Copyright()
+     * @see #setCopyright(CopyrightNotice)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getCopyrighted_Copyright()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='Copyright' namespace='##targetNamespace'"
      * @generated
      */
-    TCopyrightNotice getCopyright();
+    CopyrightNotice getCopyright();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted#getCopyright <em>Copyright</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted#getCopyright <em>Copyright</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Copyright</em>' containment reference.
      * @see #getCopyright()
      * @generated
      */
-    void setCopyright( TCopyrightNotice value );
+    void setCopyright( CopyrightNotice value );
 
-} // TCopyrighted
+} // Copyrighted
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDataAttribute.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DataAttribute.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDataAttribute.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DataAttribute.java
index 8d611ba9957684cae722a2cacc5bba6f40d47085..2899eab135a4bd33fd499abf93251fb468bdbcdd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDataAttribute.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DataAttribute.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TData Attribute</b></em>'.
+ * A representation of the model object '<em><b>Data Attribute</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,30 +36,30 @@ import org.eclipse.emf.common.util.Enumerator;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDchg <em>Dchg</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDupd <em>Dupd</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getFc <em>Fc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isIsArray <em>Is Array</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMaxValue <em>Max Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinIndex <em>Min Index</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinValue <em>Min Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isQchg <em>Qchg</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getSizeAttribute <em>Size Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDchg <em>Dchg</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getDefaultValue <em>Default Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDupd <em>Dupd</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getFc <em>Fc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isIsArray <em>Is Array</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMaxValue <em>Max Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinIndex <em>Min Index</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinValue <em>Min Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isQchg <em>Qchg</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getSizeAttribute <em>Size Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getTypeKind <em>Type Kind</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute()
  * @model extendedMetaData="name='tDataAttribute' kind='empty'"
  * @generated
  */
-public interface TDataAttribute extends TDocumentedClass {
+public interface DataAttribute extends DocumentedClass {
     /**
      * Returns the value of the '<em><b>Dchg</b></em>' attribute.
      * The default value is <code>"false"</code>.
@@ -73,7 +73,7 @@ public interface TDataAttribute extends TDocumentedClass {
      * @see #isSetDchg()
      * @see #unsetDchg()
      * @see #setDchg(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_Dchg()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_Dchg()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='dchg'"
      * @generated
@@ -81,7 +81,7 @@ public interface TDataAttribute extends TDocumentedClass {
     boolean isDchg();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDchg <em>Dchg</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDchg <em>Dchg</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Dchg</em>' attribute.
@@ -93,7 +93,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void setDchg( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDchg <em>Dchg</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDchg <em>Dchg</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetDchg()
@@ -104,7 +104,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void unsetDchg();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDchg <em>Dchg</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDchg <em>Dchg</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Dchg</em>' attribute is set.
@@ -124,7 +124,7 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Default Value</em>' attribute.
      * @see #setDefaultValue(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_DefaultValue()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_DefaultValue()
      * @model dataType="org.eclipse.emf.ecore.xml.type.NormalizedString"
      *        extendedMetaData="kind='attribute' name='defaultValue'"
      * @generated
@@ -132,7 +132,7 @@ public interface TDataAttribute extends TDocumentedClass {
     String getDefaultValue();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getDefaultValue <em>Default Value</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getDefaultValue <em>Default Value</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Default Value</em>' attribute.
@@ -154,7 +154,7 @@ public interface TDataAttribute extends TDocumentedClass {
      * @see #isSetDupd()
      * @see #unsetDupd()
      * @see #setDupd(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_Dupd()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_Dupd()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='dupd'"
      * @generated
@@ -162,7 +162,7 @@ public interface TDataAttribute extends TDocumentedClass {
     boolean isDupd();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDupd <em>Dupd</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDupd <em>Dupd</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Dupd</em>' attribute.
@@ -174,7 +174,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void setDupd( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDupd <em>Dupd</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDupd <em>Dupd</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetDupd()
@@ -185,7 +185,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void unsetDupd();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDupd <em>Dupd</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDupd <em>Dupd</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Dupd</em>' attribute is set.
@@ -205,15 +205,15 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Fc</em>' attribute.
      * @see #setFc(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_Fc()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFCAbbreviation" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_Fc()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='fc'"
      * @generated
      */
     String getFc();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getFc <em>Fc</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getFc <em>Fc</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Fc</em>' attribute.
@@ -234,7 +234,7 @@ public interface TDataAttribute extends TDocumentedClass {
      * @see #isSetIsArray()
      * @see #unsetIsArray()
      * @see #setIsArray(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_IsArray()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_IsArray()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='isArray'"
      * @generated
@@ -242,7 +242,7 @@ public interface TDataAttribute extends TDocumentedClass {
     boolean isIsArray();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isIsArray <em>Is Array</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isIsArray <em>Is Array</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Is Array</em>' attribute.
@@ -254,7 +254,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void setIsArray( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isIsArray <em>Is Array</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isIsArray <em>Is Array</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetIsArray()
@@ -265,7 +265,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void unsetIsArray();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isIsArray <em>Is Array</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isIsArray <em>Is Array</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Is Array</em>' attribute is set.
@@ -286,15 +286,14 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Max Index Attribute</em>' attribute.
      * @see #setMaxIndexAttribute(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_MaxIndexAttribute()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName"
-     *        extendedMetaData="kind='attribute' name='maxIndexAttribute'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_MaxIndexAttribute()
+     * @model extendedMetaData="kind='attribute' name='maxIndexAttribute'"
      * @generated
      */
     String getMaxIndexAttribute();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Max Index Attribute</em>' attribute.
@@ -312,7 +311,7 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Max Value</em>' attribute.
      * @see #setMaxValue(BigDecimal)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_MaxValue()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_MaxValue()
      * @model dataType="org.eclipse.emf.ecore.xml.type.Decimal"
      *        extendedMetaData="kind='attribute' name='maxValue'"
      * @generated
@@ -320,7 +319,7 @@ public interface TDataAttribute extends TDocumentedClass {
     BigDecimal getMaxValue();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMaxValue <em>Max Value</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMaxValue <em>Max Value</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Max Value</em>' attribute.
@@ -343,7 +342,7 @@ public interface TDataAttribute extends TDocumentedClass {
      * @see #isSetMinIndex()
      * @see #unsetMinIndex()
      * @see #setMinIndex(long)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_MinIndex()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_MinIndex()
      * @model default="0" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.UnsignedInt"
      *        extendedMetaData="kind='attribute' name='minIndex'"
      * @generated
@@ -351,7 +350,7 @@ public interface TDataAttribute extends TDocumentedClass {
     long getMinIndex();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinIndex <em>Min Index</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinIndex <em>Min Index</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Min Index</em>' attribute.
@@ -363,7 +362,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void setMinIndex( long value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinIndex <em>Min Index</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinIndex <em>Min Index</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetMinIndex()
@@ -374,7 +373,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void unsetMinIndex();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinIndex <em>Min Index</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinIndex <em>Min Index</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Min Index</em>' attribute is set.
@@ -394,7 +393,7 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Min Value</em>' attribute.
      * @see #setMinValue(BigDecimal)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_MinValue()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_MinValue()
      * @model dataType="org.eclipse.emf.ecore.xml.type.Decimal"
      *        extendedMetaData="kind='attribute' name='minValue'"
      * @generated
@@ -402,7 +401,7 @@ public interface TDataAttribute extends TDocumentedClass {
     BigDecimal getMinValue();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinValue <em>Min Value</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinValue <em>Min Value</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Min Value</em>' attribute.
@@ -420,15 +419,15 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -449,15 +448,15 @@ public interface TDataAttribute extends TDocumentedClass {
      * @see #isSetPresCond()
      * @see #unsetPresCond()
      * @see #setPresCond(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_PresCond()
-     * @model default="M" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionName"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_PresCond()
+     * @model default="M" unsettable="true"
      *        extendedMetaData="kind='attribute' name='presCond'"
      * @generated
      */
     String getPresCond();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond</em>' attribute.
@@ -469,7 +468,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void setPresCond( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetPresCond()
@@ -480,7 +479,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void unsetPresCond();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCond <em>Pres Cond</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCond <em>Pres Cond</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Pres Cond</em>' attribute is set.
@@ -500,15 +499,14 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args</em>' attribute.
      * @see #setPresCondArgs(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_PresCondArgs()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionArgument"
-     *        extendedMetaData="kind='attribute' name='presCondArgs'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_PresCondArgs()
+     * @model extendedMetaData="kind='attribute' name='presCondArgs'"
      * @generated
      */
     String getPresCondArgs();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args</em>' attribute.
@@ -526,15 +524,14 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args ID</em>' attribute.
      * @see #setPresCondArgsID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_PresCondArgsID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='presCondArgsID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_PresCondArgsID()
+     * @model extendedMetaData="kind='attribute' name='presCondArgsID'"
      * @generated
      */
     String getPresCondArgsID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args ID</em>' attribute.
@@ -556,7 +553,7 @@ public interface TDataAttribute extends TDocumentedClass {
      * @see #isSetQchg()
      * @see #unsetQchg()
      * @see #setQchg(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_Qchg()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_Qchg()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='qchg'"
      * @generated
@@ -564,7 +561,7 @@ public interface TDataAttribute extends TDocumentedClass {
     boolean isQchg();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isQchg <em>Qchg</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isQchg <em>Qchg</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Qchg</em>' attribute.
@@ -576,7 +573,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void setQchg( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isQchg <em>Qchg</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isQchg <em>Qchg</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetQchg()
@@ -587,7 +584,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void unsetQchg();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isQchg <em>Qchg</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isQchg <em>Qchg</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Qchg</em>' attribute is set.
@@ -608,15 +605,14 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Size Attribute</em>' attribute.
      * @see #setSizeAttribute(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_SizeAttribute()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName"
-     *        extendedMetaData="kind='attribute' name='sizeAttribute'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_SizeAttribute()
+     * @model extendedMetaData="kind='attribute' name='sizeAttribute'"
      * @generated
      */
     String getSizeAttribute();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getSizeAttribute <em>Size Attribute</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getSizeAttribute <em>Size Attribute</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Size Attribute</em>' attribute.
@@ -634,15 +630,14 @@ public interface TDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Type</em>' attribute.
      * @see #setType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_Type()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name"
-     *        extendedMetaData="kind='attribute' name='type'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_Type()
+     * @model extendedMetaData="kind='attribute' name='type'"
      * @generated
      */
     String getType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getType <em>Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getType <em>Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type</em>' attribute.
@@ -663,15 +658,15 @@ public interface TDataAttribute extends TDocumentedClass {
      * @see #isSetTypeKind()
      * @see #unsetTypeKind()
      * @see #setTypeKind(Enumerator)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataAttribute_TypeKind()
-     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeTypeKind"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataAttribute_TypeKind()
+     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.AttributeTypeKind"
      *        extendedMetaData="kind='attribute' name='typeKind'"
      * @generated
      */
     Enumerator getTypeKind();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type Kind</em>' attribute.
@@ -683,7 +678,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void setTypeKind( Enumerator value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetTypeKind()
@@ -694,7 +689,7 @@ public interface TDataAttribute extends TDocumentedClass {
     void unsetTypeKind();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getTypeKind <em>Type Kind</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getTypeKind <em>Type Kind</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Type Kind</em>' attribute is set.
@@ -705,4 +700,4 @@ public interface TDataAttribute extends TDocumentedClass {
      */
     boolean isSetTypeKind();
 
-} // TDataAttribute
+} // DataAttribute
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDataObject.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DataObject.java
similarity index 72%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDataObject.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DataObject.java
index 94ee06351424de68d815fc2db98f5c76af098554..2a723fe77054dcc816d375a42c33df7e9e68efbf 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDataObject.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DataObject.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TData Object</b></em>'.
+ * A representation of the model object '<em><b>Data Object</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -32,24 +32,24 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCond <em>Ds Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCondArgs <em>Ds Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCondArgsID <em>Ds Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#isTransient <em>Transient</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingType <em>Underlying Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCond <em>Ds Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCondArgs <em>Ds Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCondArgsID <em>Ds Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#isTransient <em>Transient</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingType <em>Underlying Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject()
  * @model extendedMetaData="name='tDataObject' kind='empty'"
  * @generated
  */
-public interface TDataObject extends TDocumentedClass {
+public interface DataObject extends DocumentedClass {
     /**
      * Returns the value of the '<em><b>Ds Pres Cond</b></em>' attribute.
      * The default value is <code>"M"</code>.
@@ -62,15 +62,15 @@ public interface TDataObject extends TDocumentedClass {
      * @see #isSetDsPresCond()
      * @see #unsetDsPresCond()
      * @see #setDsPresCond(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_DsPresCond()
-     * @model default="M" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionName"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_DsPresCond()
+     * @model default="M" unsettable="true"
      *        extendedMetaData="kind='attribute' name='dsPresCond'"
      * @generated
      */
     String getDsPresCond();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCond <em>Ds Pres Cond</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCond <em>Ds Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Ds Pres Cond</em>' attribute.
@@ -82,7 +82,7 @@ public interface TDataObject extends TDocumentedClass {
     void setDsPresCond( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCond <em>Ds Pres Cond</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCond <em>Ds Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetDsPresCond()
@@ -93,7 +93,7 @@ public interface TDataObject extends TDocumentedClass {
     void unsetDsPresCond();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCond <em>Ds Pres Cond</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCond <em>Ds Pres Cond</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Ds Pres Cond</em>' attribute is set.
@@ -113,15 +113,14 @@ public interface TDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Ds Pres Cond Args</em>' attribute.
      * @see #setDsPresCondArgs(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_DsPresCondArgs()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionArgument"
-     *        extendedMetaData="kind='attribute' name='dsPresCondArgs'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_DsPresCondArgs()
+     * @model extendedMetaData="kind='attribute' name='dsPresCondArgs'"
      * @generated
      */
     String getDsPresCondArgs();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCondArgs <em>Ds Pres Cond Args</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCondArgs <em>Ds Pres Cond Args</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Ds Pres Cond Args</em>' attribute.
@@ -139,15 +138,14 @@ public interface TDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Ds Pres Cond Args ID</em>' attribute.
      * @see #setDsPresCondArgsID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_DsPresCondArgsID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='dsPresCondArgsID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_DsPresCondArgsID()
+     * @model extendedMetaData="kind='attribute' name='dsPresCondArgsID'"
      * @generated
      */
     String getDsPresCondArgsID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCondArgsID <em>Ds Pres Cond Args ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCondArgsID <em>Ds Pres Cond Args ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Ds Pres Cond Args ID</em>' attribute.
@@ -165,15 +163,15 @@ public interface TDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObjectName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -194,15 +192,15 @@ public interface TDataObject extends TDocumentedClass {
      * @see #isSetPresCond()
      * @see #unsetPresCond()
      * @see #setPresCond(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_PresCond()
-     * @model default="M" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionName"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_PresCond()
+     * @model default="M" unsettable="true"
      *        extendedMetaData="kind='attribute' name='presCond'"
      * @generated
      */
     String getPresCond();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCond <em>Pres Cond</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond</em>' attribute.
@@ -214,7 +212,7 @@ public interface TDataObject extends TDocumentedClass {
     void setPresCond( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCond <em>Pres Cond</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetPresCond()
@@ -225,7 +223,7 @@ public interface TDataObject extends TDocumentedClass {
     void unsetPresCond();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCond <em>Pres Cond</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCond <em>Pres Cond</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Pres Cond</em>' attribute is set.
@@ -245,15 +243,14 @@ public interface TDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args</em>' attribute.
      * @see #setPresCondArgs(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_PresCondArgs()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionArgument"
-     *        extendedMetaData="kind='attribute' name='presCondArgs'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_PresCondArgs()
+     * @model extendedMetaData="kind='attribute' name='presCondArgs'"
      * @generated
      */
     String getPresCondArgs();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args</em>' attribute.
@@ -271,15 +268,14 @@ public interface TDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args ID</em>' attribute.
      * @see #setPresCondArgsID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_PresCondArgsID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='presCondArgsID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_PresCondArgsID()
+     * @model extendedMetaData="kind='attribute' name='presCondArgsID'"
      * @generated
      */
     String getPresCondArgsID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args ID</em>' attribute.
@@ -300,7 +296,7 @@ public interface TDataObject extends TDocumentedClass {
      * @see #isSetTransient()
      * @see #unsetTransient()
      * @see #setTransient(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_Transient()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_Transient()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='transient'"
      * @generated
@@ -308,7 +304,7 @@ public interface TDataObject extends TDocumentedClass {
     boolean isTransient();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#isTransient <em>Transient</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#isTransient <em>Transient</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Transient</em>' attribute.
@@ -320,7 +316,7 @@ public interface TDataObject extends TDocumentedClass {
     void setTransient( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#isTransient <em>Transient</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#isTransient <em>Transient</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetTransient()
@@ -331,7 +327,7 @@ public interface TDataObject extends TDocumentedClass {
     void unsetTransient();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#isTransient <em>Transient</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#isTransient <em>Transient</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Transient</em>' attribute is set.
@@ -351,15 +347,15 @@ public interface TDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Type</em>' attribute.
      * @see #setType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_Type()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_Type()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='type'"
      * @generated
      */
     String getType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getType <em>Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getType <em>Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type</em>' attribute.
@@ -377,15 +373,14 @@ public interface TDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Underlying Type</em>' attribute.
      * @see #setUnderlyingType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_UnderlyingType()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name"
-     *        extendedMetaData="kind='attribute' name='underlyingType'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_UnderlyingType()
+     * @model extendedMetaData="kind='attribute' name='underlyingType'"
      * @generated
      */
     String getUnderlyingType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingType <em>Underlying Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingType <em>Underlying Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Underlying Type</em>' attribute.
@@ -396,58 +391,58 @@ public interface TDataObject extends TDocumentedClass {
 
     /**
      * Returns the value of the '<em><b>Underlying Type Kind</b></em>' attribute.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * The typeKind to be used for all "undefined" attributes of the CDC of this DataObject.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Underlying Type Kind</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
      * @see #isSetUnderlyingTypeKind()
      * @see #unsetUnderlyingTypeKind()
-     * @see #setUnderlyingTypeKind(TDefinedAttributeTypeKind)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataObject_UnderlyingTypeKind()
+     * @see #setUnderlyingTypeKind(DefinedAttributeTypeKind)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataObject_UnderlyingTypeKind()
      * @model unsettable="true"
      *        extendedMetaData="kind='attribute' name='underlyingTypeKind'"
      * @generated
      */
-    TDefinedAttributeTypeKind getUnderlyingTypeKind();
+    DefinedAttributeTypeKind getUnderlyingTypeKind();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Underlying Type Kind</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
      * @see #isSetUnderlyingTypeKind()
      * @see #unsetUnderlyingTypeKind()
      * @see #getUnderlyingTypeKind()
      * @generated
      */
-    void setUnderlyingTypeKind( TDefinedAttributeTypeKind value );
+    void setUnderlyingTypeKind( DefinedAttributeTypeKind value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetUnderlyingTypeKind()
      * @see #getUnderlyingTypeKind()
-     * @see #setUnderlyingTypeKind(TDefinedAttributeTypeKind)
+     * @see #setUnderlyingTypeKind(DefinedAttributeTypeKind)
      * @generated
      */
     void unsetUnderlyingTypeKind();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Underlying Type Kind</em>' attribute is set.
      * @see #unsetUnderlyingTypeKind()
      * @see #getUnderlyingTypeKind()
-     * @see #setUnderlyingTypeKind(TDefinedAttributeTypeKind)
+     * @see #setUnderlyingTypeKind(DefinedAttributeTypeKind)
      * @generated
      */
     boolean isSetUnderlyingTypeKind();
 
-} // TDataObject
+} // DataObject
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDataSetMemberOf.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DataSetMemberOf.java
similarity index 74%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDataSetMemberOf.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DataSetMemberOf.java
index 2c40f0b9f8fd0c391a9d72c683d708024f92539f..6a4d3d165483996237203a3cfdf787566cd6648a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDataSetMemberOf.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DataSetMemberOf.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TData Set Member Of</b></em>'.
+ * A representation of the model object '<em><b>Data Set Member Of</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,68 +34,68 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf#getCb <em>Cb</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf#getCb <em>Cb</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataSetMemberOf()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataSetMemberOf()
  * @model extendedMetaData="name='tDataSetMemberOf' kind='empty'"
  * @generated
  */
-public interface TDataSetMemberOf extends EObject {
+public interface DataSetMemberOf extends EObject {
     /**
      * Returns the value of the '<em><b>Cb</b></em>' attribute.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Control block kind.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Cb</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind
      * @see #isSetCb()
      * @see #unsetCb()
-     * @see #setCb(TCBKind)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDataSetMemberOf_Cb()
+     * @see #setCb(CBKind)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDataSetMemberOf_Cb()
      * @model unsettable="true" required="true"
      *        extendedMetaData="kind='attribute' name='cb'"
      * @generated
      */
-    TCBKind getCb();
+    CBKind getCb();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf#getCb <em>Cb</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf#getCb <em>Cb</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Cb</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind
      * @see #isSetCb()
      * @see #unsetCb()
      * @see #getCb()
      * @generated
      */
-    void setCb( TCBKind value );
+    void setCb( CBKind value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf#getCb <em>Cb</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf#getCb <em>Cb</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetCb()
      * @see #getCb()
-     * @see #setCb(TCBKind)
+     * @see #setCb(CBKind)
      * @generated
      */
     void unsetCb();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf#getCb <em>Cb</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf#getCb <em>Cb</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Cb</em>' attribute is set.
      * @see #unsetCb()
      * @see #getCb()
-     * @see #setCb(TCBKind)
+     * @see #setCb(CBKind)
      * @generated
      */
     boolean isSetCb();
 
-} // TDataSetMemberOf
+} // DataSetMemberOf
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDefinedAttributeTypeKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DefinedAttributeTypeKind.java
similarity index 82%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDefinedAttributeTypeKind.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DefinedAttributeTypeKind.java
index cb01d64de143348a2c42bdc5a0fa9d5d1c4c95d7..b89c354b046ab911a5d4485a5a3674e9c0b1724b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDefinedAttributeTypeKind.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DefinedAttributeTypeKind.java
@@ -27,17 +27,17 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>TDefined Attribute Type Kind</b></em>',
+ * A representation of the literals of the enumeration '<em><b>Defined Attribute Type Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * Type kind of a data attribute.
  * <!-- end-model-doc -->
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDefinedAttributeTypeKind()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDefinedAttributeTypeKind()
  * @model extendedMetaData="name='tDefinedAttributeTypeKind'"
  * @generated
  */
-public enum TDefinedAttributeTypeKind implements Enumerator {
+public enum DefinedAttributeTypeKind implements Enumerator {
     /**
      * The '<em><b>BASIC</b></em>' literal object.
      * <!-- begin-user-doc -->
@@ -120,34 +120,34 @@ public enum TDefinedAttributeTypeKind implements Enumerator {
     public static final int CONSTRUCTED_VALUE = 2;
 
     /**
-     * An array of all the '<em><b>TDefined Attribute Type Kind</b></em>' enumerators.
+     * An array of all the '<em><b>Defined Attribute Type Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private static final TDefinedAttributeTypeKind[] VALUES_ARRAY = new TDefinedAttributeTypeKind[] { BASIC, ENUMERATED,
+    private static final DefinedAttributeTypeKind[] VALUES_ARRAY = new DefinedAttributeTypeKind[] { BASIC, ENUMERATED,
             CONSTRUCTED, };
 
     /**
-     * A public read-only list of all the '<em><b>TDefined Attribute Type Kind</b></em>' enumerators.
+     * A public read-only list of all the '<em><b>Defined Attribute Type Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List< TDefinedAttributeTypeKind > VALUES = Collections
+    public static final List< DefinedAttributeTypeKind > VALUES = Collections
             .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
-     * Returns the '<em><b>TDefined Attribute Type Kind</b></em>' literal with the specified literal value.
+     * Returns the '<em><b>Defined Attribute Type Kind</b></em>' literal with the specified literal value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param literal the literal.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TDefinedAttributeTypeKind get( String literal ) {
+    public static DefinedAttributeTypeKind get( String literal ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TDefinedAttributeTypeKind result = VALUES_ARRAY[i];
+            DefinedAttributeTypeKind result = VALUES_ARRAY[i];
             if( result.toString().equals( literal ) ) {
                 return result;
             }
@@ -156,16 +156,16 @@ public enum TDefinedAttributeTypeKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TDefined Attribute Type Kind</b></em>' literal with the specified name.
+     * Returns the '<em><b>Defined Attribute Type Kind</b></em>' literal with the specified name.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param name the name.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TDefinedAttributeTypeKind getByName( String name ) {
+    public static DefinedAttributeTypeKind getByName( String name ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TDefinedAttributeTypeKind result = VALUES_ARRAY[i];
+            DefinedAttributeTypeKind result = VALUES_ARRAY[i];
             if( result.getName().equals( name ) ) {
                 return result;
             }
@@ -174,14 +174,14 @@ public enum TDefinedAttributeTypeKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TDefined Attribute Type Kind</b></em>' literal with the specified integer value.
+     * Returns the '<em><b>Defined Attribute Type Kind</b></em>' literal with the specified integer value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the integer value.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TDefinedAttributeTypeKind get( int value ) {
+    public static DefinedAttributeTypeKind get( int value ) {
         switch( value ) {
         case BASIC_VALUE:
             return BASIC;
@@ -220,7 +220,7 @@ public enum TDefinedAttributeTypeKind implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    private TDefinedAttributeTypeKind( int value, String name, String literal ) {
+    private DefinedAttributeTypeKind( int value, String name, String literal ) {
         this.value = value;
         this.name = name;
         this.literal = literal;
@@ -267,4 +267,4 @@ public enum TDefinedAttributeTypeKind implements Enumerator {
         return literal;
     }
 
-} //TDefinedAttributeTypeKind
+} //DefinedAttributeTypeKind
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DependsOnType.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DependsOnType.java
index 679a7cd708cbbcfc6df62ce77db5a154fc1a97bc..89150a416ea39a9f8f7dcd8462b3084ea29c60ae 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DependsOnType.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DependsOnType.java
@@ -19,8 +19,6 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Depends On Type</b></em>'.
@@ -32,16 +30,14 @@ import org.eclipse.emf.ecore.EObject;
  * <ul>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getId <em>Id</em>}</li>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRelease <em>Release</em>}</li>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getVersion <em>Version</em>}</li>
  * </ul>
  *
  * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDependsOnType()
  * @model extendedMetaData="name='DependsOn_._type' kind='empty'"
  * @generated
  */
-public interface DependsOnType extends EObject {
+public interface DependsOnType extends NSDObjectWithVersionAndRelease {
     /**
      * Returns the value of the '<em><b>Id</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -52,7 +48,7 @@ public interface DependsOnType extends EObject {
      * @return the value of the '<em>Id</em>' attribute.
      * @see #setId(String)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDependsOnType_Id()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSIdentifier" required="true"
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='id'"
      * @generated
      */
@@ -71,36 +67,36 @@ public interface DependsOnType extends EObject {
     /**
      * Returns the value of the '<em><b>Publication Stage</b></em>' attribute.
      * The default value is <code>"IS"</code>.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * The publication stage of the namespace, by default IS.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDependsOnType_PublicationStage()
      * @model default="IS" unsettable="true"
      *        extendedMetaData="kind='attribute' name='publicationStage'"
      * @generated
      */
-    TPubStage getPublicationStage();
+    PubStage getPublicationStage();
 
     /**
      * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getPublicationStage <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
      * @generated
      */
-    void setPublicationStage( TPubStage value );
+    void setPublicationStage( PubStage value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getPublicationStage <em>Publication Stage</em>}' attribute.
@@ -108,7 +104,7 @@ public interface DependsOnType extends EObject {
      * <!-- end-user-doc -->
      * @see #isSetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     void unsetPublicationStage();
@@ -120,65 +116,11 @@ public interface DependsOnType extends EObject {
      * @return whether the value of the '<em>Publication Stage</em>' attribute is set.
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     boolean isSetPublicationStage();
 
-    /**
-     * Returns the value of the '<em><b>Release</b></em>' attribute.
-     * The default value is <code>"1"</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Release of the namespace version and revision, by default 1.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #setRelease(short)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDependsOnType_Release()
-     * @model default="1" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRelease"
-     *        extendedMetaData="kind='attribute' name='release'"
-     * @generated
-     */
-    short getRelease();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @generated
-     */
-    void setRelease( short value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    void unsetRelease();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRelease <em>Release</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Release</em>' attribute is set.
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    boolean isSetRelease();
-
     /**
      * Returns the value of the '<em><b>Revision</b></em>' attribute.
      * The default value is <code>"A"</code>.
@@ -192,7 +134,7 @@ public interface DependsOnType extends EObject {
      * @see #unsetRevision()
      * @see #setRevision(String)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDependsOnType_Revision()
-     * @model default="A" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRevision"
+     * @model default="A" unsettable="true"
      *        extendedMetaData="kind='attribute' name='revision'"
      * @generated
      */
@@ -233,57 +175,4 @@ public interface DependsOnType extends EObject {
      */
     boolean isSetRevision();
 
-    /**
-     * Returns the value of the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Version (year) of the namespace.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #setVersion(int)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDependsOnType_Version()
-     * @model unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSVersion" required="true"
-     *        extendedMetaData="kind='attribute' name='version'"
-     * @generated
-     */
-    int getVersion();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @generated
-     */
-    void setVersion( int value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    void unsetVersion();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getVersion <em>Version</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Version</em>' attribute is set.
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    boolean isSetVersion();
-
 } // DependsOnType
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDoc.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Doc.java
similarity index 85%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDoc.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Doc.java
index 1ec6b0ffaacaa3fa03cf029cb625a5f2c7a3d88a..fdfbb2125f2c2d6072018948860d44a07d7bea91 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDoc.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Doc.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TDoc</b></em>'.
+ * A representation of the model object '<em><b>Doc</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,17 +36,17 @@ import org.eclipse.emf.ecore.util.FeatureMap;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getMixed <em>Mixed</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getGroup <em>Group</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getAny <em>Any</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getMixed <em>Mixed</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getGroup <em>Group</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getAny <em>Any</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getId <em>Id</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDoc()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDoc()
  * @model extendedMetaData="name='tDoc' kind='mixed'"
  * @generated
  */
-public interface TDoc extends EObject {
+public interface Doc extends EObject {
     /**
      * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
      * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
@@ -57,7 +57,7 @@ public interface TDoc extends EObject {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Mixed</em>' attribute list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDoc_Mixed()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDoc_Mixed()
      * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
      *        extendedMetaData="kind='elementWildcard' name=':mixed'"
      * @generated
@@ -74,7 +74,7 @@ public interface TDoc extends EObject {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Group</em>' attribute list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDoc_Group()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDoc_Group()
      * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
      *        extendedMetaData="kind='group' name='group:1'"
      * @generated
@@ -91,7 +91,7 @@ public interface TDoc extends EObject {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Any</em>' attribute list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDoc_Any()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDoc_Any()
      * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
      *        extendedMetaData="kind='elementWildcard' wildcards='##any' name=':2' processing='lax' group='#group:1'"
      * @generated
@@ -107,15 +107,15 @@ public interface TDoc extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Id</em>' attribute.
      * @see #setId(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDoc_Id()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDoc_Id()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='id'"
      * @generated
      */
     String getId();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getId <em>Id</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getId <em>Id</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Id</em>' attribute.
@@ -124,4 +124,4 @@ public interface TDoc extends EObject {
      */
     void setId( String value );
 
-} // TDoc
+} // Doc
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentRoot.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentRoot.java
index 826456aee55315b6f352644666879b7da586f1fb..82c0ad70202b4141a8997adcc926d83ec2441229 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentRoot.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentRoot.java
@@ -110,13 +110,13 @@ public interface DocumentRoot extends EObject {
      * Root element of a file holding the allowed usages of ServiceNS-es.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Applicable Service NS</em>' containment reference.
-     * @see #setApplicableServiceNS(TApplicableServiceNS)
+     * @see #setApplicableServiceNS(ApplicableServiceNS)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentRoot_ApplicableServiceNS()
      * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
      *        extendedMetaData="kind='element' name='ApplicableServiceNS' namespace='##targetNamespace'"
      * @generated
      */
-    TApplicableServiceNS getApplicableServiceNS();
+    ApplicableServiceNS getApplicableServiceNS();
 
     /**
      * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getApplicableServiceNS <em>Applicable Service NS</em>}' containment reference.
@@ -126,7 +126,7 @@ public interface DocumentRoot extends EObject {
      * @see #getApplicableServiceNS()
      * @generated
      */
-    void setApplicableServiceNS( TApplicableServiceNS value );
+    void setApplicableServiceNS( ApplicableServiceNS value );
 
     /**
      * Returns the value of the '<em><b>Copyright</b></em>' containment reference.
@@ -136,13 +136,13 @@ public interface DocumentRoot extends EObject {
      * The copyright notice attached to the XML
      * <!-- end-model-doc -->
      * @return the value of the '<em>Copyright</em>' containment reference.
-     * @see #setCopyright(TCopyrightNotice)
+     * @see #setCopyright(CopyrightNotice)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentRoot_Copyright()
      * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
      *        extendedMetaData="kind='element' name='Copyright' namespace='##targetNamespace'"
      * @generated
      */
-    TCopyrightNotice getCopyright();
+    CopyrightNotice getCopyright();
 
     /**
      * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getCopyright <em>Copyright</em>}' containment reference.
@@ -152,7 +152,7 @@ public interface DocumentRoot extends EObject {
      * @see #getCopyright()
      * @generated
      */
-    void setCopyright( TCopyrightNotice value );
+    void setCopyright( CopyrightNotice value );
 
     /**
      * Returns the value of the '<em><b>NS</b></em>' containment reference.
@@ -162,13 +162,13 @@ public interface DocumentRoot extends EObject {
      * Root element of a namespace definition (NSD) file.
      * <!-- end-model-doc -->
      * @return the value of the '<em>NS</em>' containment reference.
-     * @see #setNS(TNS)
+     * @see #setNS(NS)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentRoot_NS()
      * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
      *        extendedMetaData="kind='element' name='NS' namespace='##targetNamespace'"
      * @generated
      */
-    TNS getNS();
+    NS getNS();
 
     /**
      * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNS <em>NS</em>}' containment reference.
@@ -178,7 +178,7 @@ public interface DocumentRoot extends EObject {
      * @see #getNS()
      * @generated
      */
-    void setNS( TNS value );
+    void setNS( NS value );
 
     /**
      * Returns the value of the '<em><b>NS Doc</b></em>' containment reference.
@@ -188,13 +188,13 @@ public interface DocumentRoot extends EObject {
      * Root element of a file holding the documentation strings of an NSD file (NSDOC).
      * <!-- end-model-doc -->
      * @return the value of the '<em>NS Doc</em>' containment reference.
-     * @see #setNSDoc(TNSDoc)
+     * @see #setNSDoc(NSDoc)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentRoot_NSDoc()
      * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
      *        extendedMetaData="kind='element' name='NSDoc' namespace='##targetNamespace'"
      * @generated
      */
-    TNSDoc getNSDoc();
+    NSDoc getNSDoc();
 
     /**
      * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNSDoc <em>NS Doc</em>}' containment reference.
@@ -204,7 +204,7 @@ public interface DocumentRoot extends EObject {
      * @see #getNSDoc()
      * @generated
      */
-    void setNSDoc( TNSDoc value );
+    void setNSDoc( NSDoc value );
 
     /**
      * Returns the value of the '<em><b>Service NS</b></em>' containment reference.
@@ -214,13 +214,13 @@ public interface DocumentRoot extends EObject {
      * Root element of a service namespace definition (SNSD) file.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service NS</em>' containment reference.
-     * @see #setServiceNS(TServiceNS)
+     * @see #setServiceNS(ServiceNS)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentRoot_ServiceNS()
      * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
      *        extendedMetaData="kind='element' name='ServiceNS' namespace='##targetNamespace'"
      * @generated
      */
-    TServiceNS getServiceNS();
+    ServiceNS getServiceNS();
 
     /**
      * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getServiceNS <em>Service NS</em>}' containment reference.
@@ -230,6 +230,6 @@ public interface DocumentRoot extends EObject {
      * @see #getServiceNS()
      * @generated
      */
-    void setServiceNS( TServiceNS value );
+    void setServiceNS( ServiceNS value );
 
 } // DocumentRoot
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDocumentedClass.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentedClass.java
similarity index 79%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDocumentedClass.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentedClass.java
index 950f48f39bae289f3d1f4070174f7b26be16d471..0c737563855313567994cfe15c3866bce171f1a5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TDocumentedClass.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentedClass.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TDocumented Class</b></em>'.
+ * A representation of the model object '<em><b>Documented Class</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,16 +34,16 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isDeprecated <em>Deprecated</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isInformative <em>Informative</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isDeprecated <em>Deprecated</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isInformative <em>Informative</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDocumentedClass()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentedClass()
  * @model extendedMetaData="name='tDocumentedClass' kind='empty'"
  * @generated
  */
-public interface TDocumentedClass extends EObject {
+public interface DocumentedClass extends EObject {
     /**
      * Returns the value of the '<em><b>Deprecated</b></em>' attribute.
      * The default value is <code>"false"</code>.
@@ -56,7 +56,7 @@ public interface TDocumentedClass extends EObject {
      * @see #isSetDeprecated()
      * @see #unsetDeprecated()
      * @see #setDeprecated(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDocumentedClass_Deprecated()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentedClass_Deprecated()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='deprecated'"
      * @generated
@@ -64,7 +64,7 @@ public interface TDocumentedClass extends EObject {
     boolean isDeprecated();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isDeprecated <em>Deprecated</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isDeprecated <em>Deprecated</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Deprecated</em>' attribute.
@@ -76,7 +76,7 @@ public interface TDocumentedClass extends EObject {
     void setDeprecated( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isDeprecated <em>Deprecated</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isDeprecated <em>Deprecated</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetDeprecated()
@@ -87,7 +87,7 @@ public interface TDocumentedClass extends EObject {
     void unsetDeprecated();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isDeprecated <em>Deprecated</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isDeprecated <em>Deprecated</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Deprecated</em>' attribute is set.
@@ -107,15 +107,14 @@ public interface TDocumentedClass extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Desc ID</em>' attribute.
      * @see #setDescID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDocumentedClass_DescID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='descID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentedClass_DescID()
+     * @model extendedMetaData="kind='attribute' name='descID'"
      * @generated
      */
     String getDescID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#getDescID <em>Desc ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getDescID <em>Desc ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Desc ID</em>' attribute.
@@ -136,7 +135,7 @@ public interface TDocumentedClass extends EObject {
      * @see #isSetInformative()
      * @see #unsetInformative()
      * @see #setInformative(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTDocumentedClass_Informative()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentedClass_Informative()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='informative'"
      * @generated
@@ -144,7 +143,7 @@ public interface TDocumentedClass extends EObject {
     boolean isInformative();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isInformative <em>Informative</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isInformative <em>Informative</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Informative</em>' attribute.
@@ -156,7 +155,7 @@ public interface TDocumentedClass extends EObject {
     void setInformative( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isInformative <em>Informative</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isInformative <em>Informative</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetInformative()
@@ -167,7 +166,7 @@ public interface TDocumentedClass extends EObject {
     void unsetInformative();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isInformative <em>Informative</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isInformative <em>Informative</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Informative</em>' attribute is set.
@@ -178,4 +177,4 @@ public interface TDocumentedClass extends EObject {
      */
     boolean isSetInformative();
 
-} // TDocumentedClass
+} // DocumentedClass
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TEnumeration.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Enumeration.java
similarity index 75%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TEnumeration.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Enumeration.java
index 579883fc0dcad351f0d17819c003674fcadee356..cad7d78ef6903bf0a8fc2456b59f584bea64b513 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TEnumeration.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Enumeration.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TEnumeration</b></em>'.
+ * A representation of the model object '<em><b>Enumeration</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,19 +34,19 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getLiteral <em>Literal</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getInheritedFrom <em>Inherited From</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getLiteral <em>Literal</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getInheritedFrom <em>Inherited From</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getName <em>Name</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTEnumeration()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getEnumeration()
  * @model extendedMetaData="name='tEnumeration' kind='elementOnly'"
  * @generated
  */
-public interface TEnumeration extends TTitledClass {
+public interface Enumeration extends TitledClass {
     /**
      * Returns the value of the '<em><b>Literal</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal}.
      * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Literal</em>' containment reference list isn't clear,
@@ -54,12 +54,12 @@ public interface TEnumeration extends TTitledClass {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Literal</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTEnumeration_Literal()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getEnumeration_Literal()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='Literal' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TLiteral > getLiteral();
+    EList< Literal > getLiteral();
 
     /**
      * Returns the value of the '<em><b>Inherited From</b></em>' attribute.
@@ -70,15 +70,14 @@ public interface TEnumeration extends TTitledClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Inherited From</em>' attribute.
      * @see #setInheritedFrom(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTEnumeration_InheritedFrom()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name"
-     *        extendedMetaData="kind='attribute' name='inheritedFrom'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getEnumeration_InheritedFrom()
+     * @model extendedMetaData="kind='attribute' name='inheritedFrom'"
      * @generated
      */
     String getInheritedFrom();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getInheritedFrom <em>Inherited From</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getInheritedFrom <em>Inherited From</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Inherited From</em>' attribute.
@@ -96,15 +95,15 @@ public interface TEnumeration extends TTitledClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTEnumeration_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getEnumeration_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -113,4 +112,4 @@ public interface TEnumeration extends TTitledClass {
      */
     void setName( String value );
 
-} // TEnumeration
+} // Enumeration
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TEnumerations.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Enumerations.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TEnumerations.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Enumerations.java
index 7dbcd19f9d5c2c2873b5278dde422a222e029faa..deb022cb6a65be923016a8683c77559770aa0c40 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TEnumerations.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Enumerations.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TEnumerations</b></em>'.
+ * A representation of the model object '<em><b>Enumerations</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,28 +36,28 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations#getEnumeration <em>Enumeration</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations#getEnumeration <em>Enumeration</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTEnumerations()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getEnumerations()
  * @model extendedMetaData="name='tEnumerations' kind='elementOnly'"
  * @generated
  */
-public interface TEnumerations extends EObject {
+public interface Enumerations extends EObject {
     /**
      * Returns the value of the '<em><b>Enumeration</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Definition of an enumeration.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Enumeration</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTEnumerations_Enumeration()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getEnumerations_Enumeration()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='Enumeration' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TEnumeration > getEnumeration();
+    EList< Enumeration > getEnumeration();
 
-} // TEnumerations
+} // Enumerations
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TFunctionalConstraint.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/FunctionalConstraint.java
similarity index 71%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TFunctionalConstraint.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/FunctionalConstraint.java
index ac9dd23fcd599e05560b181eb7ecaae9cb18027f..86de5c9eb9db76763c98ef54c2ee0d2880cd542c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TFunctionalConstraint.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/FunctionalConstraint.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TFunctional Constraint</b></em>'.
+ * A representation of the model object '<em><b>Functional Constraint</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,17 +34,17 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getApplicableServices <em>Applicable Services</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getAbbreviation <em>Abbreviation</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getTitleID <em>Title ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getApplicableServices <em>Applicable Services</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getAbbreviation <em>Abbreviation</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getTitleID <em>Title ID</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTFunctionalConstraint()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint()
  * @model extendedMetaData="name='tFunctionalConstraint' kind='elementOnly'"
  * @generated
  */
-public interface TFunctionalConstraint extends EObject {
+public interface FunctionalConstraint extends EObject {
     /**
      * Returns the value of the '<em><b>Applicable Services</b></em>' containment reference.
      * <!-- begin-user-doc -->
@@ -54,23 +54,23 @@ public interface TFunctionalConstraint extends EObject {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Applicable Services</em>' containment reference.
-     * @see #setApplicableServices(TApplicableServices)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTFunctionalConstraint_ApplicableServices()
+     * @see #setApplicableServices(ApplicableServices)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint_ApplicableServices()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ApplicableServices' namespace='##targetNamespace'"
      * @generated
      */
-    TApplicableServices getApplicableServices();
+    ApplicableServices getApplicableServices();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getApplicableServices <em>Applicable Services</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getApplicableServices <em>Applicable Services</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Applicable Services</em>' containment reference.
      * @see #getApplicableServices()
      * @generated
      */
-    void setApplicableServices( TApplicableServices value );
+    void setApplicableServices( ApplicableServices value );
 
     /**
      * Returns the value of the '<em><b>Abbreviation</b></em>' attribute.
@@ -81,15 +81,15 @@ public interface TFunctionalConstraint extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Abbreviation</em>' attribute.
      * @see #setAbbreviation(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTFunctionalConstraint_Abbreviation()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFCAbbreviation" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint_Abbreviation()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='abbreviation'"
      * @generated
      */
     String getAbbreviation();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getAbbreviation <em>Abbreviation</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getAbbreviation <em>Abbreviation</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Abbreviation</em>' attribute.
@@ -107,15 +107,14 @@ public interface TFunctionalConstraint extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Desc ID</em>' attribute.
      * @see #setDescID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTFunctionalConstraint_DescID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='descID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint_DescID()
+     * @model extendedMetaData="kind='attribute' name='descID'"
      * @generated
      */
     String getDescID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getDescID <em>Desc ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getDescID <em>Desc ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Desc ID</em>' attribute.
@@ -133,15 +132,14 @@ public interface TFunctionalConstraint extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Title ID</em>' attribute.
      * @see #setTitleID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTFunctionalConstraint_TitleID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='titleID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint_TitleID()
+     * @model extendedMetaData="kind='attribute' name='titleID'"
      * @generated
      */
     String getTitleID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getTitleID <em>Title ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getTitleID <em>Title ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Title ID</em>' attribute.
@@ -150,4 +148,4 @@ public interface TFunctionalConstraint extends EObject {
      */
     void setTitleID( String value );
 
-} // TFunctionalConstraint
+} // FunctionalConstraint
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TFunctionalConstraints.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/FunctionalConstraints.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TFunctionalConstraints.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/FunctionalConstraints.java
index c96e60fc23714238067639d08b4b0de6deceaec9..3adf965c52302a82df1afce30cb6bf6491b42a49 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TFunctionalConstraints.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/FunctionalConstraints.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TFunctional Constraints</b></em>'.
+ * A representation of the model object '<em><b>Functional Constraints</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,28 +36,28 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints#getFunctionalConstraint <em>Functional Constraint</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints#getFunctionalConstraint <em>Functional Constraint</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTFunctionalConstraints()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraints()
  * @model extendedMetaData="name='tFunctionalConstraints' kind='elementOnly'"
  * @generated
  */
-public interface TFunctionalConstraints extends EObject {
+public interface FunctionalConstraints extends EObject {
     /**
      * Returns the value of the '<em><b>Functional Constraint</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Definition of a Functional Constraint.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Functional Constraint</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTFunctionalConstraints_FunctionalConstraint()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraints_FunctionalConstraint()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='FunctionalConstraint' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TFunctionalConstraint > getFunctionalConstraint();
+    EList< FunctionalConstraint > getFunctionalConstraint();
 
-} // TFunctionalConstraints
+} // FunctionalConstraints
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLNClass.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LNClass.java
similarity index 82%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLNClass.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LNClass.java
index e20a50a2b29f49305ef9d0bb98e9173c954e24b9..844e537f18ccd05e59084d18fd21187d0dafe42e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLNClass.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LNClass.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TLN Class</b></em>'.
+ * A representation of the model object '<em><b>LN Class</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -32,16 +32,16 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isCanHaveLOG <em>Can Have LOG</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isIsExtension <em>Is Extension</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isCanHaveLOG <em>Can Have LOG</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isIsExtension <em>Is Extension</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#getName <em>Name</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLNClass()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLNClass()
  * @model extendedMetaData="name='tLNClass' kind='elementOnly'"
  * @generated
  */
-public interface TLNClass extends TAnyLNClass {
+public interface LNClass extends AnyLNClass {
     /**
      * Returns the value of the '<em><b>Can Have LOG</b></em>' attribute.
      * The default value is <code>"false"</code>.
@@ -54,7 +54,7 @@ public interface TLNClass extends TAnyLNClass {
      * @see #isSetCanHaveLOG()
      * @see #unsetCanHaveLOG()
      * @see #setCanHaveLOG(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLNClass_CanHaveLOG()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLNClass_CanHaveLOG()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='canHaveLOG'"
      * @generated
@@ -62,7 +62,7 @@ public interface TLNClass extends TAnyLNClass {
     boolean isCanHaveLOG();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isCanHaveLOG <em>Can Have LOG</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isCanHaveLOG <em>Can Have LOG</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Can Have LOG</em>' attribute.
@@ -74,7 +74,7 @@ public interface TLNClass extends TAnyLNClass {
     void setCanHaveLOG( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isCanHaveLOG <em>Can Have LOG</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isCanHaveLOG <em>Can Have LOG</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetCanHaveLOG()
@@ -85,7 +85,7 @@ public interface TLNClass extends TAnyLNClass {
     void unsetCanHaveLOG();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isCanHaveLOG <em>Can Have LOG</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isCanHaveLOG <em>Can Have LOG</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Can Have LOG</em>' attribute is set.
@@ -108,7 +108,7 @@ public interface TLNClass extends TAnyLNClass {
      * @see #isSetIsExtension()
      * @see #unsetIsExtension()
      * @see #setIsExtension(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLNClass_IsExtension()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLNClass_IsExtension()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='isExtension'"
      * @generated
@@ -116,7 +116,7 @@ public interface TLNClass extends TAnyLNClass {
     boolean isIsExtension();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isIsExtension <em>Is Extension</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isIsExtension <em>Is Extension</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Is Extension</em>' attribute.
@@ -128,7 +128,7 @@ public interface TLNClass extends TAnyLNClass {
     void setIsExtension( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isIsExtension <em>Is Extension</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isIsExtension <em>Is Extension</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetIsExtension()
@@ -139,7 +139,7 @@ public interface TLNClass extends TAnyLNClass {
     void unsetIsExtension();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isIsExtension <em>Is Extension</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isIsExtension <em>Is Extension</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Is Extension</em>' attribute is set.
@@ -159,15 +159,15 @@ public interface TLNClass extends TAnyLNClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLNClass_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClassName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLNClass_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -176,4 +176,4 @@ public interface TLNClass extends TAnyLNClass {
      */
     void setName( String value );
 
-} // TLNClass
+} // LNClass
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLNClasses.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LNClasses.java
similarity index 79%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLNClasses.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LNClasses.java
index 4179afdb076b79a602ac1957695ec18b2b8d021a..f3aaaff592a91d800414215348afbf1e1a9e12ec 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLNClasses.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LNClasses.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TLN Classes</b></em>'.
+ * A representation of the model object '<em><b>LN Classes</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,45 +36,45 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses#getAbstractLNClass <em>Abstract LN Class</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses#getLNClass <em>LN Class</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses#getAbstractLNClass <em>Abstract LN Class</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses#getLNClass <em>LN Class</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLNClasses()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLNClasses()
  * @model extendedMetaData="name='tLNClasses' kind='elementOnly'"
  * @generated
  */
-public interface TLNClasses extends EObject {
+public interface LNClasses extends EObject {
     /**
      * Returns the value of the '<em><b>Abstract LN Class</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Definition of an abstract logical node.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Abstract LN Class</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLNClasses_AbstractLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLNClasses_AbstractLNClass()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='AbstractLNClass' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TAbstractLNClass > getAbstractLNClass();
+    EList< AbstractLNClass > getAbstractLNClass();
 
     /**
      * Returns the value of the '<em><b>LN Class</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Definition of a (non-abstract) logical node.
      * <!-- end-model-doc -->
      * @return the value of the '<em>LN Class</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLNClasses_LNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLNClasses_LNClass()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='LNClass' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TLNClass > getLNClass();
+    EList< LNClass > getLNClass();
 
-} // TLNClasses
+} // LNClasses
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLicense.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/License.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLicense.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/License.java
index 0ac82c71f9a121918ae3354d569c6b730c12cd46..7482468477cac4cd9667241221e319b12f8ec512 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLicense.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/License.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TLicense</b></em>'.
+ * A representation of the model object '<em><b>License</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,16 +36,16 @@ import org.eclipse.emf.ecore.util.FeatureMap;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getMixed <em>Mixed</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getKind <em>Kind</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getUri <em>Uri</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getMixed <em>Mixed</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getKind <em>Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getUri <em>Uri</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLicense()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLicense()
  * @model extendedMetaData="name='tLicense' kind='mixed'"
  * @generated
  */
-public interface TLicense extends EObject {
+public interface License extends EObject {
     /**
      * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
      * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
@@ -56,7 +56,7 @@ public interface TLicense extends EObject {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Mixed</em>' attribute list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLicense_Mixed()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLicense_Mixed()
      * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
      *        extendedMetaData="kind='elementWildcard' name=':mixed'"
      * @generated
@@ -65,56 +65,56 @@ public interface TLicense extends EObject {
 
     /**
      * Returns the value of the '<em><b>Kind</b></em>' attribute.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * kind of license
      * <!-- end-model-doc -->
      * @return the value of the '<em>Kind</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind
      * @see #isSetKind()
      * @see #unsetKind()
-     * @see #setKind(TLicenseKind)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLicense_Kind()
+     * @see #setKind(LicenseKind)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLicense_Kind()
      * @model unsettable="true"
      *        extendedMetaData="kind='attribute' name='kind'"
      * @generated
      */
-    TLicenseKind getKind();
+    LicenseKind getKind();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getKind <em>Kind</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getKind <em>Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Kind</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind
      * @see #isSetKind()
      * @see #unsetKind()
      * @see #getKind()
      * @generated
      */
-    void setKind( TLicenseKind value );
+    void setKind( LicenseKind value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getKind <em>Kind</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getKind <em>Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetKind()
      * @see #getKind()
-     * @see #setKind(TLicenseKind)
+     * @see #setKind(LicenseKind)
      * @generated
      */
     void unsetKind();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getKind <em>Kind</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getKind <em>Kind</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Kind</em>' attribute is set.
      * @see #unsetKind()
      * @see #getKind()
-     * @see #setKind(TLicenseKind)
+     * @see #setKind(LicenseKind)
      * @generated
      */
     boolean isSetKind();
@@ -128,7 +128,7 @@ public interface TLicense extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Uri</em>' attribute.
      * @see #setUri(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLicense_Uri()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLicense_Uri()
      * @model dataType="org.eclipse.emf.ecore.xml.type.NormalizedString"
      *        extendedMetaData="kind='attribute' name='uri'"
      * @generated
@@ -136,7 +136,7 @@ public interface TLicense extends EObject {
     String getUri();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getUri <em>Uri</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getUri <em>Uri</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Uri</em>' attribute.
@@ -145,4 +145,4 @@ public interface TLicense extends EObject {
      */
     void setUri( String value );
 
-} // TLicense
+} // License
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLicenseKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LicenseKind.java
similarity index 83%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLicenseKind.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LicenseKind.java
index 47075fb4e7d45cdba10406b4e9cd2ad2b6d893a3..16d07bd8d2fa4a6c744642c79ee5f3fdb5129909 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLicenseKind.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LicenseKind.java
@@ -27,17 +27,17 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>TLicense Kind</b></em>',
+ * A representation of the literals of the enumeration '<em><b>License Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * Kind of license
  * <!-- end-model-doc -->
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLicenseKind()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLicenseKind()
  * @model extendedMetaData="name='tLicenseKind'"
  * @generated
  */
-public enum TLicenseKind implements Enumerator {
+public enum LicenseKind implements Enumerator {
     /**
      * The '<em><b>Standard</b></em>' literal object.
      * <!-- begin-user-doc -->
@@ -114,32 +114,32 @@ public enum TLicenseKind implements Enumerator {
     public static final int NONE_VALUE = 2;
 
     /**
-     * An array of all the '<em><b>TLicense Kind</b></em>' enumerators.
+     * An array of all the '<em><b>License Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private static final TLicenseKind[] VALUES_ARRAY = new TLicenseKind[] { STANDARD, PRIVATE, NONE, };
+    private static final LicenseKind[] VALUES_ARRAY = new LicenseKind[] { STANDARD, PRIVATE, NONE, };
 
     /**
-     * A public read-only list of all the '<em><b>TLicense Kind</b></em>' enumerators.
+     * A public read-only list of all the '<em><b>License Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List< TLicenseKind > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
+    public static final List< LicenseKind > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
-     * Returns the '<em><b>TLicense Kind</b></em>' literal with the specified literal value.
+     * Returns the '<em><b>License Kind</b></em>' literal with the specified literal value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param literal the literal.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TLicenseKind get( String literal ) {
+    public static LicenseKind get( String literal ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TLicenseKind result = VALUES_ARRAY[i];
+            LicenseKind result = VALUES_ARRAY[i];
             if( result.toString().equals( literal ) ) {
                 return result;
             }
@@ -148,16 +148,16 @@ public enum TLicenseKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TLicense Kind</b></em>' literal with the specified name.
+     * Returns the '<em><b>License Kind</b></em>' literal with the specified name.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param name the name.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TLicenseKind getByName( String name ) {
+    public static LicenseKind getByName( String name ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TLicenseKind result = VALUES_ARRAY[i];
+            LicenseKind result = VALUES_ARRAY[i];
             if( result.getName().equals( name ) ) {
                 return result;
             }
@@ -166,14 +166,14 @@ public enum TLicenseKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TLicense Kind</b></em>' literal with the specified integer value.
+     * Returns the '<em><b>License Kind</b></em>' literal with the specified integer value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the integer value.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TLicenseKind get( int value ) {
+    public static LicenseKind get( int value ) {
         switch( value ) {
         case STANDARD_VALUE:
             return STANDARD;
@@ -212,7 +212,7 @@ public enum TLicenseKind implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    private TLicenseKind( int value, String name, String literal ) {
+    private LicenseKind( int value, String name, String literal ) {
         this.value = value;
         this.name = name;
         this.literal = literal;
@@ -259,4 +259,4 @@ public enum TLicenseKind implements Enumerator {
         return literal;
     }
 
-} //TLicenseKind
+} //LicenseKind
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLiteral.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Literal.java
similarity index 80%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLiteral.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Literal.java
index a04c05e278bc328a4040d880cafe9f69ebf60621..a30b6794cce2f936b437c819cd5d0f9f6ff888c7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TLiteral.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Literal.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TLiteral</b></em>'.
+ * A representation of the model object '<em><b>Literal</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -32,15 +32,15 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getLiteralVal <em>Literal Val</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getLiteralVal <em>Literal Val</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getName <em>Name</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLiteral()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLiteral()
  * @model extendedMetaData="name='tLiteral' kind='empty'"
  * @generated
  */
-public interface TLiteral extends TDocumentedClass {
+public interface Literal extends DocumentedClass {
     /**
      * Returns the value of the '<em><b>Literal Val</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -52,7 +52,7 @@ public interface TLiteral extends TDocumentedClass {
      * @see #isSetLiteralVal()
      * @see #unsetLiteralVal()
      * @see #setLiteralVal(int)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLiteral_LiteralVal()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLiteral_LiteralVal()
      * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Int" required="true"
      *        extendedMetaData="kind='attribute' name='literalVal'"
      * @generated
@@ -60,7 +60,7 @@ public interface TLiteral extends TDocumentedClass {
     int getLiteralVal();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getLiteralVal <em>Literal Val</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getLiteralVal <em>Literal Val</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Literal Val</em>' attribute.
@@ -72,7 +72,7 @@ public interface TLiteral extends TDocumentedClass {
     void setLiteralVal( int value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getLiteralVal <em>Literal Val</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getLiteralVal <em>Literal Val</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetLiteralVal()
@@ -83,7 +83,7 @@ public interface TLiteral extends TDocumentedClass {
     void unsetLiteralVal();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getLiteralVal <em>Literal Val</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getLiteralVal <em>Literal Val</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Literal Val</em>' attribute is set.
@@ -103,15 +103,15 @@ public interface TLiteral extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTLiteral_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteralName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getLiteral_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -120,4 +120,4 @@ public interface TLiteral extends TDocumentedClass {
      */
     void setName( String value );
 
-} // TLiteral
+} // Literal
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TNS.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NS.java
similarity index 63%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TNS.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NS.java
index 1d208650371712822e8fd9844b167e8f8cf361f3..be4da421c2a8282df8e1b4bf466dca5bf46c76c0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TNS.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NS.java
@@ -23,7 +23,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TNS</b></em>'.
+ * A representation of the model object '<em><b>NS</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,31 +34,29 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getChanges <em>Changes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getDependsOn <em>Depends On</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getBasicTypes <em>Basic Types</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getFunctionalConstraints <em>Functional Constraints</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPresenceConditions <em>Presence Conditions</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getAbbreviations <em>Abbreviations</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getEnumerations <em>Enumerations</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getConstructedAttributes <em>Constructed Attributes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getCDCs <em>CD Cs</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getLNClasses <em>LN Classes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getId <em>Id</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getUmlDate <em>Uml Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getUmlVersion <em>Uml Version</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getChanges <em>Changes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getDependsOn <em>Depends On</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getBasicTypes <em>Basic Types</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getFunctionalConstraints <em>Functional Constraints</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPresenceConditions <em>Presence Conditions</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getAbbreviations <em>Abbreviations</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getEnumerations <em>Enumerations</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getConstructedAttributes <em>Constructed Attributes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getCDCs <em>CD Cs</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getLNClasses <em>LN Classes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPublicationStage <em>Publication Stage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getRevision <em>Revision</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getUmlDate <em>Uml Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getUmlVersion <em>Uml Version</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS()
  * @model extendedMetaData="name='tNS' kind='elementOnly'"
  * @generated
  */
-public interface TNS extends TCopyrighted {
+public interface NS extends Copyrighted, NSDObjectWithVersionAndRelease {
     /**
      * Returns the value of the '<em><b>Changes</b></em>' containment reference.
      * <!-- begin-user-doc -->
@@ -67,23 +65,23 @@ public interface TNS extends TCopyrighted {
      * The version/revision/release this namespace is based on, including the TISSUEs implemented in this release.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Changes</em>' containment reference.
-     * @see #setChanges(TChanges)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_Changes()
+     * @see #setChanges(Changes)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_Changes()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='Changes' namespace='##targetNamespace'"
      * @generated
      */
-    TChanges getChanges();
+    Changes getChanges();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getChanges <em>Changes</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getChanges <em>Changes</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Changes</em>' containment reference.
      * @see #getChanges()
      * @generated
      */
-    void setChanges( TChanges value );
+    void setChanges( Changes value );
 
     /**
      * Returns the value of the '<em><b>Depends On</b></em>' containment reference.
@@ -94,7 +92,7 @@ public interface TNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Depends On</em>' containment reference.
      * @see #setDependsOn(DependsOnType)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_DependsOn()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_DependsOn()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='DependsOn' namespace='##targetNamespace'"
      * @generated
@@ -102,7 +100,7 @@ public interface TNS extends TCopyrighted {
     DependsOnType getDependsOn();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getDependsOn <em>Depends On</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getDependsOn <em>Depends On</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Depends On</em>' containment reference.
@@ -119,23 +117,23 @@ public interface TNS extends TCopyrighted {
      * List of basic types added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine "included" ones). Note: shall only be used in practice by the 7-2 namespace.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Basic Types</em>' containment reference.
-     * @see #setBasicTypes(TBasicTypes)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_BasicTypes()
+     * @see #setBasicTypes(BasicTypes)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_BasicTypes()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='BasicTypes' namespace='##targetNamespace'"
      * @generated
      */
-    TBasicTypes getBasicTypes();
+    BasicTypes getBasicTypes();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getBasicTypes <em>Basic Types</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getBasicTypes <em>Basic Types</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Basic Types</em>' containment reference.
      * @see #getBasicTypes()
      * @generated
      */
-    void setBasicTypes( TBasicTypes value );
+    void setBasicTypes( BasicTypes value );
 
     /**
      * Returns the value of the '<em><b>Functional Constraints</b></em>' containment reference.
@@ -145,23 +143,23 @@ public interface TNS extends TCopyrighted {
      * List of Functional Constraints added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine "included" ones).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Functional Constraints</em>' containment reference.
-     * @see #setFunctionalConstraints(TFunctionalConstraints)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_FunctionalConstraints()
+     * @see #setFunctionalConstraints(FunctionalConstraints)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_FunctionalConstraints()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='FunctionalConstraints' namespace='##targetNamespace'"
      * @generated
      */
-    TFunctionalConstraints getFunctionalConstraints();
+    FunctionalConstraints getFunctionalConstraints();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getFunctionalConstraints <em>Functional Constraints</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getFunctionalConstraints <em>Functional Constraints</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Functional Constraints</em>' containment reference.
      * @see #getFunctionalConstraints()
      * @generated
      */
-    void setFunctionalConstraints( TFunctionalConstraints value );
+    void setFunctionalConstraints( FunctionalConstraints value );
 
     /**
      * Returns the value of the '<em><b>Presence Conditions</b></em>' containment reference.
@@ -171,23 +169,23 @@ public interface TNS extends TCopyrighted {
      * List of presence conditions added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine "included" ones.).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Presence Conditions</em>' containment reference.
-     * @see #setPresenceConditions(TPresenceConditions)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_PresenceConditions()
+     * @see #setPresenceConditions(PresenceConditions)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_PresenceConditions()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='PresenceConditions' namespace='##targetNamespace'"
      * @generated
      */
-    TPresenceConditions getPresenceConditions();
+    PresenceConditions getPresenceConditions();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPresenceConditions <em>Presence Conditions</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPresenceConditions <em>Presence Conditions</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Presence Conditions</em>' containment reference.
      * @see #getPresenceConditions()
      * @generated
      */
-    void setPresenceConditions( TPresenceConditions value );
+    void setPresenceConditions( PresenceConditions value );
 
     /**
      * Returns the value of the '<em><b>Abbreviations</b></em>' containment reference.
@@ -197,23 +195,23 @@ public interface TNS extends TCopyrighted {
      * List of abbreviations added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine "included" ones.).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Abbreviations</em>' containment reference.
-     * @see #setAbbreviations(TAbbreviations)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_Abbreviations()
+     * @see #setAbbreviations(Abbreviations)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_Abbreviations()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='Abbreviations' namespace='##targetNamespace'"
      * @generated
      */
-    TAbbreviations getAbbreviations();
+    Abbreviations getAbbreviations();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getAbbreviations <em>Abbreviations</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getAbbreviations <em>Abbreviations</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Abbreviations</em>' containment reference.
      * @see #getAbbreviations()
      * @generated
      */
-    void setAbbreviations( TAbbreviations value );
+    void setAbbreviations( Abbreviations value );
 
     /**
      * Returns the value of the '<em><b>Enumerations</b></em>' containment reference.
@@ -223,23 +221,23 @@ public interface TNS extends TCopyrighted {
      * List of Enumerations added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine "included" ones).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Enumerations</em>' containment reference.
-     * @see #setEnumerations(TEnumerations)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_Enumerations()
+     * @see #setEnumerations(Enumerations)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_Enumerations()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='Enumerations' namespace='##targetNamespace'"
      * @generated
      */
-    TEnumerations getEnumerations();
+    Enumerations getEnumerations();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getEnumerations <em>Enumerations</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getEnumerations <em>Enumerations</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Enumerations</em>' containment reference.
      * @see #getEnumerations()
      * @generated
      */
-    void setEnumerations( TEnumerations value );
+    void setEnumerations( Enumerations value );
 
     /**
      * Returns the value of the '<em><b>Constructed Attributes</b></em>' containment reference.
@@ -249,23 +247,23 @@ public interface TNS extends TCopyrighted {
      * List of Constructed Attributes added by this namespace. Constructed Attributes are not allowed to be extended by another namespace. Note: shall only be used in practice by the 7-3
      * <!-- end-model-doc -->
      * @return the value of the '<em>Constructed Attributes</em>' containment reference.
-     * @see #setConstructedAttributes(TConstructedAttributes)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_ConstructedAttributes()
+     * @see #setConstructedAttributes(ConstructedAttributes)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_ConstructedAttributes()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ConstructedAttributes' namespace='##targetNamespace'"
      * @generated
      */
-    TConstructedAttributes getConstructedAttributes();
+    ConstructedAttributes getConstructedAttributes();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getConstructedAttributes <em>Constructed Attributes</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getConstructedAttributes <em>Constructed Attributes</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Constructed Attributes</em>' containment reference.
      * @see #getConstructedAttributes()
      * @generated
      */
-    void setConstructedAttributes( TConstructedAttributes value );
+    void setConstructedAttributes( ConstructedAttributes value );
 
     /**
      * Returns the value of the '<em><b>CD Cs</b></em>' containment reference.
@@ -275,23 +273,23 @@ public interface TNS extends TCopyrighted {
      * List of CDCs added by this namespace. CDCs are not allowed to be extended by another namespace. Note: shall only be used in practice by the 7-3
      * <!-- end-model-doc -->
      * @return the value of the '<em>CD Cs</em>' containment reference.
-     * @see #setCDCs(TCDCs)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_CDCs()
+     * @see #setCDCs(CDCs)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_CDCs()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='CDCs' namespace='##targetNamespace'"
      * @generated
      */
-    TCDCs getCDCs();
+    CDCs getCDCs();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getCDCs <em>CD Cs</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getCDCs <em>CD Cs</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>CD Cs</em>' containment reference.
      * @see #getCDCs()
      * @generated
      */
-    void setCDCs( TCDCs value );
+    void setCDCs( CDCs value );
 
     /**
      * Returns the value of the '<em><b>LN Classes</b></em>' containment reference.
@@ -301,23 +299,23 @@ public interface TNS extends TCopyrighted {
      * List of LNClasses added by this namespace. Is cumulative to those defined in namespaces this one DependsOn (may not redefine "included" ones).
      * <!-- end-model-doc -->
      * @return the value of the '<em>LN Classes</em>' containment reference.
-     * @see #setLNClasses(TLNClasses)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_LNClasses()
+     * @see #setLNClasses(LNClasses)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_LNClasses()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='LNClasses' namespace='##targetNamespace'"
      * @generated
      */
-    TLNClasses getLNClasses();
+    LNClasses getLNClasses();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getLNClasses <em>LN Classes</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getLNClasses <em>LN Classes</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>LN Classes</em>' containment reference.
      * @see #getLNClasses()
      * @generated
      */
-    void setLNClasses( TLNClasses value );
+    void setLNClasses( LNClasses value );
 
     /**
      * Returns the value of the '<em><b>Desc ID</b></em>' attribute.
@@ -328,15 +326,14 @@ public interface TNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Desc ID</em>' attribute.
      * @see #setDescID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_DescID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='descID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_DescID()
+     * @model extendedMetaData="kind='attribute' name='descID'"
      * @generated
      */
     String getDescID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getDescID <em>Desc ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getDescID <em>Desc ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Desc ID</em>' attribute.
@@ -354,15 +351,15 @@ public interface TNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Id</em>' attribute.
      * @see #setId(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_Id()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSIdentifier" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_Id()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='id'"
      * @generated
      */
     String getId();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getId <em>Id</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getId <em>Id</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Id</em>' attribute.
@@ -374,114 +371,60 @@ public interface TNS extends TCopyrighted {
     /**
      * Returns the value of the '<em><b>Publication Stage</b></em>' attribute.
      * The default value is <code>"IS"</code>.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * The publication stage of the namespace, by default IS.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
-     * @see #setPublicationStage(TPubStage)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_PublicationStage()
+     * @see #setPublicationStage(PubStage)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_PublicationStage()
      * @model default="IS" unsettable="true"
      *        extendedMetaData="kind='attribute' name='publicationStage'"
      * @generated
      */
-    TPubStage getPublicationStage();
+    PubStage getPublicationStage();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPublicationStage <em>Publication Stage</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPublicationStage <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
      * @generated
      */
-    void setPublicationStage( TPubStage value );
+    void setPublicationStage( PubStage value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPublicationStage <em>Publication Stage</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPublicationStage <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     void unsetPublicationStage();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPublicationStage <em>Publication Stage</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPublicationStage <em>Publication Stage</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Publication Stage</em>' attribute is set.
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     boolean isSetPublicationStage();
 
-    /**
-     * Returns the value of the '<em><b>Release</b></em>' attribute.
-     * The default value is <code>"1"</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Release of the namespace version and revision, by default 1.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #setRelease(short)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_Release()
-     * @model default="1" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRelease"
-     *        extendedMetaData="kind='attribute' name='release'"
-     * @generated
-     */
-    short getRelease();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @generated
-     */
-    void setRelease( short value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    void unsetRelease();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRelease <em>Release</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Release</em>' attribute is set.
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    boolean isSetRelease();
-
     /**
      * Returns the value of the '<em><b>Revision</b></em>' attribute.
      * The default value is <code>"A"</code>.
@@ -494,15 +437,15 @@ public interface TNS extends TCopyrighted {
      * @see #isSetRevision()
      * @see #unsetRevision()
      * @see #setRevision(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_Revision()
-     * @model default="A" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRevision"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_Revision()
+     * @model default="A" unsettable="true"
      *        extendedMetaData="kind='attribute' name='revision'"
      * @generated
      */
     String getRevision();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRevision <em>Revision</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getRevision <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Revision</em>' attribute.
@@ -514,7 +457,7 @@ public interface TNS extends TCopyrighted {
     void setRevision( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRevision <em>Revision</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getRevision <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetRevision()
@@ -525,7 +468,7 @@ public interface TNS extends TCopyrighted {
     void unsetRevision();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRevision <em>Revision</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getRevision <em>Revision</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Revision</em>' attribute is set.
@@ -546,7 +489,7 @@ public interface TNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Uml Date</em>' attribute.
      * @see #setUmlDate(XMLGregorianCalendar)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_UmlDate()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_UmlDate()
      * @model dataType="org.eclipse.emf.ecore.xml.type.DateTime"
      *        extendedMetaData="kind='attribute' name='umlDate'"
      * @generated
@@ -554,7 +497,7 @@ public interface TNS extends TCopyrighted {
     XMLGregorianCalendar getUmlDate();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getUmlDate <em>Uml Date</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getUmlDate <em>Uml Date</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Uml Date</em>' attribute.
@@ -572,15 +515,14 @@ public interface TNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Uml Version</em>' attribute.
      * @see #setUmlVersion(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_UmlVersion()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUMLVersion"
-     *        extendedMetaData="kind='attribute' name='umlVersion'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNS_UmlVersion()
+     * @model extendedMetaData="kind='attribute' name='umlVersion'"
      * @generated
      */
     String getUmlVersion();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getUmlVersion <em>Uml Version</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getUmlVersion <em>Uml Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Uml Version</em>' attribute.
@@ -589,57 +531,4 @@ public interface TNS extends TCopyrighted {
      */
     void setUmlVersion( String value );
 
-    /**
-     * Returns the value of the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Version (year) of the namespace.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #setVersion(int)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNS_Version()
-     * @model unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSVersion" required="true"
-     *        extendedMetaData="kind='attribute' name='version'"
-     * @generated
-     */
-    int getVersion();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @generated
-     */
-    void setVersion( int value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    void unsetVersion();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getVersion <em>Version</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Version</em>' attribute is set.
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    boolean isSetVersion();
-
-} // TNS
+} // NS
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NSDObjectWithVersionAndRelease.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NSDObjectWithVersionAndRelease.java
new file mode 100644
index 0000000000000000000000000000000000000000..187b313cef6fe99a2cd8c6919d2094318b2c99cd
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NSDObjectWithVersionAndRelease.java
@@ -0,0 +1,151 @@
+/**
+ *  Copyright (c) 2019 CentraleSupélec & EDF.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ * 
+ */
+package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>NSD Object With Version And Release</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getRelease <em>Release</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDObjectWithVersionAndRelease()
+ * @model abstract="true"
+ * @generated
+ */
+public interface NSDObjectWithVersionAndRelease extends EObject {
+    /**
+     * Returns the value of the '<em><b>Release</b></em>' attribute.
+     * The default value is <code>"1"</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Release</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Release</em>' attribute.
+     * @see #isSetRelease()
+     * @see #unsetRelease()
+     * @see #setRelease(Integer)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDObjectWithVersionAndRelease_Release()
+     * @model default="1" unsettable="true"
+     *        extendedMetaData="kind='attribute' name='release'"
+     * @generated
+     */
+    Integer getRelease();
+
+    /**
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getRelease <em>Release</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Release</em>' attribute.
+     * @see #isSetRelease()
+     * @see #unsetRelease()
+     * @see #getRelease()
+     * @generated
+     */
+    void setRelease( Integer value );
+
+    /**
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getRelease <em>Release</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isSetRelease()
+     * @see #getRelease()
+     * @see #setRelease(Integer)
+     * @generated
+     */
+    void unsetRelease();
+
+    /**
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getRelease <em>Release</em>}' attribute is set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return whether the value of the '<em>Release</em>' attribute is set.
+     * @see #unsetRelease()
+     * @see #getRelease()
+     * @see #setRelease(Integer)
+     * @generated
+     */
+    boolean isSetRelease();
+
+    /**
+     * Returns the value of the '<em><b>Version</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Version</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Version</em>' attribute.
+     * @see #isSetVersion()
+     * @see #unsetVersion()
+     * @see #setVersion(Integer)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDObjectWithVersionAndRelease_Version()
+     * @model unsettable="true" required="true"
+     *        extendedMetaData="kind='attribute' name='version'"
+     * @generated
+     */
+    Integer getVersion();
+
+    /**
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getVersion <em>Version</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Version</em>' attribute.
+     * @see #isSetVersion()
+     * @see #unsetVersion()
+     * @see #getVersion()
+     * @generated
+     */
+    void setVersion( Integer value );
+
+    /**
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getVersion <em>Version</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isSetVersion()
+     * @see #getVersion()
+     * @see #setVersion(Integer)
+     * @generated
+     */
+    void unsetVersion();
+
+    /**
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getVersion <em>Version</em>}' attribute is set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return whether the value of the '<em>Version</em>' attribute is set.
+     * @see #unsetVersion()
+     * @see #getVersion()
+     * @see #setVersion(Integer)
+     * @generated
+     */
+    boolean isSetVersion();
+
+} // NSDObjectWithVersionAndRelease
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TNSDoc.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NSDoc.java
similarity index 57%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TNSDoc.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NSDoc.java
index 1a794f5cf4402278a8e8f762e738ff6098f165e7..5dc111ee7094b853c09db404fc5c4bc70b8f1863 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TNSDoc.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NSDoc.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TNS Doc</b></em>'.
+ * A representation of the model object '<em><b>NS Doc</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,37 +36,35 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getDoc <em>Doc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getId <em>Id</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getLang <em>Lang</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getUmlDate <em>Uml Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getUmlVersion <em>Uml Version</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getDoc <em>Doc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getLang <em>Lang</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getPublicationStage <em>Publication Stage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getRevision <em>Revision</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getUmlDate <em>Uml Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getUmlVersion <em>Uml Version</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDoc()
  * @model extendedMetaData="name='tNSDoc' kind='elementOnly'"
  * @generated
  */
-public interface TNSDoc extends TCopyrighted {
+public interface NSDoc extends Copyrighted, NSDObjectWithVersionAndRelease {
     /**
      * Returns the value of the '<em><b>Doc</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * List of documentation identifiers and corresponding documentation strings in the corresponding language.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Doc</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc_Doc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDoc_Doc()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='Doc' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TDoc > getDoc();
+    EList< Doc > getDoc();
 
     /**
      * Returns the value of the '<em><b>Id</b></em>' attribute.
@@ -77,15 +75,15 @@ public interface TNSDoc extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Id</em>' attribute.
      * @see #setId(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc_Id()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSIdentifier" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDoc_Id()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='id'"
      * @generated
      */
     String getId();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getId <em>Id</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getId <em>Id</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Id</em>' attribute.
@@ -103,7 +101,7 @@ public interface TNSDoc extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Lang</em>' attribute.
      * @see #setLang(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc_Lang()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDoc_Lang()
      * @model dataType="org.eclipse.emf.ecore.xml.type.Language" required="true"
      *        extendedMetaData="kind='attribute' name='lang'"
      * @generated
@@ -111,7 +109,7 @@ public interface TNSDoc extends TCopyrighted {
     String getLang();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getLang <em>Lang</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getLang <em>Lang</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Lang</em>' attribute.
@@ -123,114 +121,60 @@ public interface TNSDoc extends TCopyrighted {
     /**
      * Returns the value of the '<em><b>Publication Stage</b></em>' attribute.
      * The default value is <code>"IS"</code>.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * The publication stage of the namespace, by default IS.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
-     * @see #setPublicationStage(TPubStage)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc_PublicationStage()
+     * @see #setPublicationStage(PubStage)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDoc_PublicationStage()
      * @model default="IS" unsettable="true"
      *        extendedMetaData="kind='attribute' name='publicationStage'"
      * @generated
      */
-    TPubStage getPublicationStage();
+    PubStage getPublicationStage();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getPublicationStage <em>Publication Stage</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getPublicationStage <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
      * @generated
      */
-    void setPublicationStage( TPubStage value );
+    void setPublicationStage( PubStage value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getPublicationStage <em>Publication Stage</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getPublicationStage <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     void unsetPublicationStage();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getPublicationStage <em>Publication Stage</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getPublicationStage <em>Publication Stage</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Publication Stage</em>' attribute is set.
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     boolean isSetPublicationStage();
 
-    /**
-     * Returns the value of the '<em><b>Release</b></em>' attribute.
-     * The default value is <code>"1"</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Release of the namespace version and revision, by default 1.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #setRelease(short)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc_Release()
-     * @model default="1" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRelease"
-     *        extendedMetaData="kind='attribute' name='release'"
-     * @generated
-     */
-    short getRelease();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @generated
-     */
-    void setRelease( short value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    void unsetRelease();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRelease <em>Release</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Release</em>' attribute is set.
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    boolean isSetRelease();
-
     /**
      * Returns the value of the '<em><b>Revision</b></em>' attribute.
      * The default value is <code>"A"</code>.
@@ -243,15 +187,15 @@ public interface TNSDoc extends TCopyrighted {
      * @see #isSetRevision()
      * @see #unsetRevision()
      * @see #setRevision(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc_Revision()
-     * @model default="A" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRevision"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDoc_Revision()
+     * @model default="A" unsettable="true"
      *        extendedMetaData="kind='attribute' name='revision'"
      * @generated
      */
     String getRevision();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRevision <em>Revision</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getRevision <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Revision</em>' attribute.
@@ -263,7 +207,7 @@ public interface TNSDoc extends TCopyrighted {
     void setRevision( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRevision <em>Revision</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getRevision <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetRevision()
@@ -274,7 +218,7 @@ public interface TNSDoc extends TCopyrighted {
     void unsetRevision();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRevision <em>Revision</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getRevision <em>Revision</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Revision</em>' attribute is set.
@@ -295,7 +239,7 @@ public interface TNSDoc extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Uml Date</em>' attribute.
      * @see #setUmlDate(XMLGregorianCalendar)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc_UmlDate()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDoc_UmlDate()
      * @model dataType="org.eclipse.emf.ecore.xml.type.DateTime"
      *        extendedMetaData="kind='attribute' name='umlDate'"
      * @generated
@@ -303,7 +247,7 @@ public interface TNSDoc extends TCopyrighted {
     XMLGregorianCalendar getUmlDate();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getUmlDate <em>Uml Date</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getUmlDate <em>Uml Date</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Uml Date</em>' attribute.
@@ -321,15 +265,14 @@ public interface TNSDoc extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Uml Version</em>' attribute.
      * @see #setUmlVersion(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc_UmlVersion()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUMLVersion"
-     *        extendedMetaData="kind='attribute' name='umlVersion'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNSDoc_UmlVersion()
+     * @model extendedMetaData="kind='attribute' name='umlVersion'"
      * @generated
      */
     String getUmlVersion();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getUmlVersion <em>Uml Version</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getUmlVersion <em>Uml Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Uml Version</em>' attribute.
@@ -338,57 +281,4 @@ public interface TNSDoc extends TCopyrighted {
      */
     void setUmlVersion( String value );
 
-    /**
-     * Returns the value of the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Version (year) of the namespace.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #setVersion(int)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNSDoc_Version()
-     * @model unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSVersion" required="true"
-     *        extendedMetaData="kind='attribute' name='version'"
-     * @generated
-     */
-    int getVersion();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @generated
-     */
-    void setVersion( int value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    void unsetVersion();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getVersion <em>Version</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Version</em>' attribute is set.
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    boolean isSetVersion();
-
-} // TNSDoc
+} // NSDoc
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TNotice.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Notice.java
similarity index 87%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TNotice.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Notice.java
index ce6f8178b0dd54d7faec159f7b342b38e21fe70e..5aa2e36e8e1cec71820df133fe8efe08af4712b9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TNotice.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/Notice.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TNotice</b></em>'.
+ * A representation of the model object '<em><b>Notice</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,14 +36,14 @@ import org.eclipse.emf.ecore.util.FeatureMap;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice#getMixed <em>Mixed</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice#getMixed <em>Mixed</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNotice()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNotice()
  * @model extendedMetaData="name='tNotice' kind='mixed'"
  * @generated
  */
-public interface TNotice extends EObject {
+public interface Notice extends EObject {
     /**
      * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
      * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
@@ -54,11 +54,11 @@ public interface TNotice extends EObject {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Mixed</em>' attribute list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTNotice_Mixed()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getNotice_Mixed()
      * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
      *        extendedMetaData="kind='elementWildcard' name=':mixed'"
      * @generated
      */
     FeatureMap getMixed();
 
-} // TNotice
+} // Notice
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdFactory.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdFactory.java
index 2b691f5833bf825d444b85f4937b877017ecd5c5..abd1236c416c92c77130137d2be87c0e767843a7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdFactory.java
@@ -75,409 +75,409 @@ public interface NsdFactory extends EFactory {
     ServiceType createServiceType();
 
     /**
-     * Returns a new object of class '<em>TAbbreviation</em>'.
+     * Returns a new object of class '<em>Abbreviation</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TAbbreviation</em>'.
+     * @return a new object of class '<em>Abbreviation</em>'.
      * @generated
      */
-    TAbbreviation createTAbbreviation();
+    Abbreviation createAbbreviation();
 
     /**
-     * Returns a new object of class '<em>TAbbreviations</em>'.
+     * Returns a new object of class '<em>Abbreviations</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TAbbreviations</em>'.
+     * @return a new object of class '<em>Abbreviations</em>'.
      * @generated
      */
-    TAbbreviations createTAbbreviations();
+    Abbreviations createAbbreviations();
 
     /**
-     * Returns a new object of class '<em>TAbstract LN Class</em>'.
+     * Returns a new object of class '<em>Abstract LN Class</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TAbstract LN Class</em>'.
+     * @return a new object of class '<em>Abstract LN Class</em>'.
      * @generated
      */
-    TAbstractLNClass createTAbstractLNClass();
+    AbstractLNClass createAbstractLNClass();
 
     /**
-     * Returns a new object of class '<em>TApplicable Service NS</em>'.
+     * Returns a new object of class '<em>Applicable Service NS</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TApplicable Service NS</em>'.
+     * @return a new object of class '<em>Applicable Service NS</em>'.
      * @generated
      */
-    TApplicableServiceNS createTApplicableServiceNS();
+    ApplicableServiceNS createApplicableServiceNS();
 
     /**
-     * Returns a new object of class '<em>TApplicable Services</em>'.
+     * Returns a new object of class '<em>Applicable Services</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TApplicable Services</em>'.
+     * @return a new object of class '<em>Applicable Services</em>'.
      * @generated
      */
-    TApplicableServices createTApplicableServices();
+    ApplicableServices createApplicableServices();
 
     /**
-     * Returns a new object of class '<em>TBasic Type</em>'.
+     * Returns a new object of class '<em>Basic Type</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TBasic Type</em>'.
+     * @return a new object of class '<em>Basic Type</em>'.
      * @generated
      */
-    TBasicType createTBasicType();
+    BasicType createBasicType();
 
     /**
-     * Returns a new object of class '<em>TBasic Types</em>'.
+     * Returns a new object of class '<em>Basic Types</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TBasic Types</em>'.
+     * @return a new object of class '<em>Basic Types</em>'.
      * @generated
      */
-    TBasicTypes createTBasicTypes();
+    BasicTypes createBasicTypes();
 
     /**
-     * Returns a new object of class '<em>TCDC</em>'.
+     * Returns a new object of class '<em>CDC</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TCDC</em>'.
+     * @return a new object of class '<em>CDC</em>'.
      * @generated
      */
-    TCDC createTCDC();
+    CDC createCDC();
 
     /**
-     * Returns a new object of class '<em>TCD Cs</em>'.
+     * Returns a new object of class '<em>CD Cs</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TCD Cs</em>'.
+     * @return a new object of class '<em>CD Cs</em>'.
      * @generated
      */
-    TCDCs createTCDCs();
+    CDCs createCDCs();
 
     /**
-     * Returns a new object of class '<em>TChanges</em>'.
+     * Returns a new object of class '<em>Changes</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TChanges</em>'.
+     * @return a new object of class '<em>Changes</em>'.
      * @generated
      */
-    TChanges createTChanges();
+    Changes createChanges();
 
     /**
-     * Returns a new object of class '<em>TConstructed Attribute</em>'.
+     * Returns a new object of class '<em>Constructed Attribute</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TConstructed Attribute</em>'.
+     * @return a new object of class '<em>Constructed Attribute</em>'.
      * @generated
      */
-    TConstructedAttribute createTConstructedAttribute();
+    ConstructedAttribute createConstructedAttribute();
 
     /**
-     * Returns a new object of class '<em>TConstructed Attributes</em>'.
+     * Returns a new object of class '<em>Constructed Attributes</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TConstructed Attributes</em>'.
+     * @return a new object of class '<em>Constructed Attributes</em>'.
      * @generated
      */
-    TConstructedAttributes createTConstructedAttributes();
+    ConstructedAttributes createConstructedAttributes();
 
     /**
-     * Returns a new object of class '<em>TCopyrighted</em>'.
+     * Returns a new object of class '<em>Copyrighted</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TCopyrighted</em>'.
+     * @return a new object of class '<em>Copyrighted</em>'.
      * @generated
      */
-    TCopyrighted createTCopyrighted();
+    Copyrighted createCopyrighted();
 
     /**
-     * Returns a new object of class '<em>TCopyright Notice</em>'.
+     * Returns a new object of class '<em>Copyright Notice</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TCopyright Notice</em>'.
+     * @return a new object of class '<em>Copyright Notice</em>'.
      * @generated
      */
-    TCopyrightNotice createTCopyrightNotice();
+    CopyrightNotice createCopyrightNotice();
 
     /**
-     * Returns a new object of class '<em>TData Attribute</em>'.
+     * Returns a new object of class '<em>Data Attribute</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TData Attribute</em>'.
+     * @return a new object of class '<em>Data Attribute</em>'.
      * @generated
      */
-    TDataAttribute createTDataAttribute();
+    DataAttribute createDataAttribute();
 
     /**
-     * Returns a new object of class '<em>TData Object</em>'.
+     * Returns a new object of class '<em>Data Object</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TData Object</em>'.
+     * @return a new object of class '<em>Data Object</em>'.
      * @generated
      */
-    TDataObject createTDataObject();
+    DataObject createDataObject();
 
     /**
-     * Returns a new object of class '<em>TData Set Member Of</em>'.
+     * Returns a new object of class '<em>Data Set Member Of</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TData Set Member Of</em>'.
+     * @return a new object of class '<em>Data Set Member Of</em>'.
      * @generated
      */
-    TDataSetMemberOf createTDataSetMemberOf();
+    DataSetMemberOf createDataSetMemberOf();
 
     /**
-     * Returns a new object of class '<em>TDoc</em>'.
+     * Returns a new object of class '<em>Doc</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TDoc</em>'.
+     * @return a new object of class '<em>Doc</em>'.
      * @generated
      */
-    TDoc createTDoc();
+    Doc createDoc();
 
     /**
-     * Returns a new object of class '<em>TDocumented Class</em>'.
+     * Returns a new object of class '<em>Documented Class</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TDocumented Class</em>'.
+     * @return a new object of class '<em>Documented Class</em>'.
      * @generated
      */
-    TDocumentedClass createTDocumentedClass();
+    DocumentedClass createDocumentedClass();
 
     /**
-     * Returns a new object of class '<em>TEnumeration</em>'.
+     * Returns a new object of class '<em>Enumeration</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TEnumeration</em>'.
+     * @return a new object of class '<em>Enumeration</em>'.
      * @generated
      */
-    TEnumeration createTEnumeration();
+    Enumeration createEnumeration();
 
     /**
-     * Returns a new object of class '<em>TEnumerations</em>'.
+     * Returns a new object of class '<em>Enumerations</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TEnumerations</em>'.
+     * @return a new object of class '<em>Enumerations</em>'.
      * @generated
      */
-    TEnumerations createTEnumerations();
+    Enumerations createEnumerations();
 
     /**
-     * Returns a new object of class '<em>TFunctional Constraint</em>'.
+     * Returns a new object of class '<em>Functional Constraint</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TFunctional Constraint</em>'.
+     * @return a new object of class '<em>Functional Constraint</em>'.
      * @generated
      */
-    TFunctionalConstraint createTFunctionalConstraint();
+    FunctionalConstraint createFunctionalConstraint();
 
     /**
-     * Returns a new object of class '<em>TFunctional Constraints</em>'.
+     * Returns a new object of class '<em>Functional Constraints</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TFunctional Constraints</em>'.
+     * @return a new object of class '<em>Functional Constraints</em>'.
      * @generated
      */
-    TFunctionalConstraints createTFunctionalConstraints();
+    FunctionalConstraints createFunctionalConstraints();
 
     /**
-     * Returns a new object of class '<em>TLicense</em>'.
+     * Returns a new object of class '<em>License</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TLicense</em>'.
+     * @return a new object of class '<em>License</em>'.
      * @generated
      */
-    TLicense createTLicense();
+    License createLicense();
 
     /**
-     * Returns a new object of class '<em>TLiteral</em>'.
+     * Returns a new object of class '<em>Literal</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TLiteral</em>'.
+     * @return a new object of class '<em>Literal</em>'.
      * @generated
      */
-    TLiteral createTLiteral();
+    Literal createLiteral();
 
     /**
-     * Returns a new object of class '<em>TLN Class</em>'.
+     * Returns a new object of class '<em>LN Class</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TLN Class</em>'.
+     * @return a new object of class '<em>LN Class</em>'.
      * @generated
      */
-    TLNClass createTLNClass();
+    LNClass createLNClass();
 
     /**
-     * Returns a new object of class '<em>TLN Classes</em>'.
+     * Returns a new object of class '<em>LN Classes</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TLN Classes</em>'.
+     * @return a new object of class '<em>LN Classes</em>'.
      * @generated
      */
-    TLNClasses createTLNClasses();
+    LNClasses createLNClasses();
 
     /**
-     * Returns a new object of class '<em>TNotice</em>'.
+     * Returns a new object of class '<em>Notice</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TNotice</em>'.
+     * @return a new object of class '<em>Notice</em>'.
      * @generated
      */
-    TNotice createTNotice();
+    Notice createNotice();
 
     /**
-     * Returns a new object of class '<em>TNS</em>'.
+     * Returns a new object of class '<em>NS</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TNS</em>'.
+     * @return a new object of class '<em>NS</em>'.
      * @generated
      */
-    TNS createTNS();
+    NS createNS();
 
     /**
-     * Returns a new object of class '<em>TNS Doc</em>'.
+     * Returns a new object of class '<em>NS Doc</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TNS Doc</em>'.
+     * @return a new object of class '<em>NS Doc</em>'.
      * @generated
      */
-    TNSDoc createTNSDoc();
+    NSDoc createNSDoc();
 
     /**
-     * Returns a new object of class '<em>TPresence Condition</em>'.
+     * Returns a new object of class '<em>Presence Condition</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TPresence Condition</em>'.
+     * @return a new object of class '<em>Presence Condition</em>'.
      * @generated
      */
-    TPresenceCondition createTPresenceCondition();
+    PresenceCondition createPresenceCondition();
 
     /**
-     * Returns a new object of class '<em>TPresence Conditions</em>'.
+     * Returns a new object of class '<em>Presence Conditions</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TPresence Conditions</em>'.
+     * @return a new object of class '<em>Presence Conditions</em>'.
      * @generated
      */
-    TPresenceConditions createTPresenceConditions();
+    PresenceConditions createPresenceConditions();
 
     /**
-     * Returns a new object of class '<em>TService CDC</em>'.
+     * Returns a new object of class '<em>Service CDC</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService CDC</em>'.
+     * @return a new object of class '<em>Service CDC</em>'.
      * @generated
      */
-    TServiceCDC createTServiceCDC();
+    ServiceCDC createServiceCDC();
 
     /**
-     * Returns a new object of class '<em>TService CD Cs</em>'.
+     * Returns a new object of class '<em>Service CD Cs</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService CD Cs</em>'.
+     * @return a new object of class '<em>Service CD Cs</em>'.
      * @generated
      */
-    TServiceCDCs createTServiceCDCs();
+    ServiceCDCs createServiceCDCs();
 
     /**
-     * Returns a new object of class '<em>TService Constructed Attribute</em>'.
+     * Returns a new object of class '<em>Service Constructed Attribute</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService Constructed Attribute</em>'.
+     * @return a new object of class '<em>Service Constructed Attribute</em>'.
      * @generated
      */
-    TServiceConstructedAttribute createTServiceConstructedAttribute();
+    ServiceConstructedAttribute createServiceConstructedAttribute();
 
     /**
-     * Returns a new object of class '<em>TService Constructed Attributes</em>'.
+     * Returns a new object of class '<em>Service Constructed Attributes</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService Constructed Attributes</em>'.
+     * @return a new object of class '<em>Service Constructed Attributes</em>'.
      * @generated
      */
-    TServiceConstructedAttributes createTServiceConstructedAttributes();
+    ServiceConstructedAttributes createServiceConstructedAttributes();
 
     /**
-     * Returns a new object of class '<em>TService Data Attribute</em>'.
+     * Returns a new object of class '<em>Service Data Attribute</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService Data Attribute</em>'.
+     * @return a new object of class '<em>Service Data Attribute</em>'.
      * @generated
      */
-    TServiceDataAttribute createTServiceDataAttribute();
+    ServiceDataAttribute createServiceDataAttribute();
 
     /**
-     * Returns a new object of class '<em>TService NS</em>'.
+     * Returns a new object of class '<em>Service NS</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService NS</em>'.
+     * @return a new object of class '<em>Service NS</em>'.
      * @generated
      */
-    TServiceNS createTServiceNS();
+    ServiceNS createServiceNS();
 
     /**
-     * Returns a new object of class '<em>TService Ns Usage</em>'.
+     * Returns a new object of class '<em>Service Ns Usage</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService Ns Usage</em>'.
+     * @return a new object of class '<em>Service Ns Usage</em>'.
      * @generated
      */
-    TServiceNsUsage createTServiceNsUsage();
+    ServiceNsUsage createServiceNsUsage();
 
     /**
-     * Returns a new object of class '<em>TService Parameter</em>'.
+     * Returns a new object of class '<em>Service Parameter</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService Parameter</em>'.
+     * @return a new object of class '<em>Service Parameter</em>'.
      * @generated
      */
-    TServiceParameter createTServiceParameter();
+    ServiceParameter createServiceParameter();
 
     /**
-     * Returns a new object of class '<em>TService Type Realization</em>'.
+     * Returns a new object of class '<em>Service Type Realization</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService Type Realization</em>'.
+     * @return a new object of class '<em>Service Type Realization</em>'.
      * @generated
      */
-    TServiceTypeRealization createTServiceTypeRealization();
+    ServiceTypeRealization createServiceTypeRealization();
 
     /**
-     * Returns a new object of class '<em>TService Type Realizations</em>'.
+     * Returns a new object of class '<em>Service Type Realizations</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TService Type Realizations</em>'.
+     * @return a new object of class '<em>Service Type Realizations</em>'.
      * @generated
      */
-    TServiceTypeRealizations createTServiceTypeRealizations();
+    ServiceTypeRealizations createServiceTypeRealizations();
 
     /**
-     * Returns a new object of class '<em>TSub Data Attribute</em>'.
+     * Returns a new object of class '<em>Sub Data Attribute</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TSub Data Attribute</em>'.
+     * @return a new object of class '<em>Sub Data Attribute</em>'.
      * @generated
      */
-    TSubDataAttribute createTSubDataAttribute();
+    SubDataAttribute createSubDataAttribute();
 
     /**
-     * Returns a new object of class '<em>TSub Data Object</em>'.
+     * Returns a new object of class '<em>Sub Data Object</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TSub Data Object</em>'.
+     * @return a new object of class '<em>Sub Data Object</em>'.
      * @generated
      */
-    TSubDataObject createTSubDataObject();
+    SubDataObject createSubDataObject();
 
     /**
-     * Returns a new object of class '<em>TTitled Class</em>'.
+     * Returns a new object of class '<em>Titled Class</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return a new object of class '<em>TTitled Class</em>'.
+     * @return a new object of class '<em>Titled Class</em>'.
      * @generated
      */
-    TTitledClass createTTitledClass();
+    TitledClass createTitledClass();
 
     /**
      * Returns the package supported by this factory.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdPackage.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdPackage.java
index 9523b26a449ecb46f9d9f1203cfdd6c02760ea9b..6897358560638402e8c9487044a8ee1a36ca7b73 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdPackage.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdPackage.java
@@ -78,6 +78,52 @@ public interface NsdPackage extends EPackage {
      */
     NsdPackage eINSTANCE = fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl.init();
 
+    /**
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDObjectWithVersionAndReleaseImpl <em>NSD Object With Version And Release</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDObjectWithVersionAndReleaseImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getNSDObjectWithVersionAndRelease()
+     * @generated
+     */
+    int NSD_OBJECT_WITH_VERSION_AND_RELEASE = 50;
+
+    /**
+     * The feature id for the '<em><b>Release</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE = 0;
+
+    /**
+     * The feature id for the '<em><b>Version</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION = 1;
+
+    /**
+     * The number of structural features of the '<em>NSD Object With Version And Release</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT = 2;
+
+    /**
+     * The number of operations of the '<em>NSD Object With Version And Release</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int NSD_OBJECT_WITH_VERSION_AND_RELEASE_OPERATION_COUNT = 0;
+
     /**
      * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AppliesToTypeImpl <em>Applies To Type</em>}' class.
      * <!-- begin-user-doc -->
@@ -89,49 +135,49 @@ public interface NsdPackage extends EPackage {
     int APPLIES_TO_TYPE = 0;
 
     /**
-     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * The feature id for the '<em><b>Release</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int APPLIES_TO_TYPE__ID = 0;
+    int APPLIES_TO_TYPE__RELEASE = NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE;
 
     /**
-     * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
+     * The feature id for the '<em><b>Version</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int APPLIES_TO_TYPE__PUBLICATION_STAGE = 1;
+    int APPLIES_TO_TYPE__VERSION = NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION;
 
     /**
-     * The feature id for the '<em><b>Release</b></em>' attribute.
+     * The feature id for the '<em><b>Id</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int APPLIES_TO_TYPE__RELEASE = 2;
+    int APPLIES_TO_TYPE__ID = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Revision</b></em>' attribute.
+     * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int APPLIES_TO_TYPE__REVISION = 3;
+    int APPLIES_TO_TYPE__PUBLICATION_STAGE = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 1;
 
     /**
-     * The feature id for the '<em><b>Version</b></em>' attribute.
+     * The feature id for the '<em><b>Revision</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int APPLIES_TO_TYPE__VERSION = 4;
+    int APPLIES_TO_TYPE__REVISION = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 2;
 
     /**
      * The number of structural features of the '<em>Applies To Type</em>' class.
@@ -140,7 +186,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int APPLIES_TO_TYPE_FEATURE_COUNT = 5;
+    int APPLIES_TO_TYPE_FEATURE_COUNT = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 3;
 
     /**
      * The number of operations of the '<em>Applies To Type</em>' class.
@@ -149,7 +195,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int APPLIES_TO_TYPE_OPERATION_COUNT = 0;
+    int APPLIES_TO_TYPE_OPERATION_COUNT = NSD_OBJECT_WITH_VERSION_AND_RELEASE_OPERATION_COUNT + 0;
 
     /**
      * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DependsOnTypeImpl <em>Depends On Type</em>}' class.
@@ -162,49 +208,49 @@ public interface NsdPackage extends EPackage {
     int DEPENDS_ON_TYPE = 1;
 
     /**
-     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * The feature id for the '<em><b>Release</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int DEPENDS_ON_TYPE__ID = 0;
+    int DEPENDS_ON_TYPE__RELEASE = NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE;
 
     /**
-     * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
+     * The feature id for the '<em><b>Version</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int DEPENDS_ON_TYPE__PUBLICATION_STAGE = 1;
+    int DEPENDS_ON_TYPE__VERSION = NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION;
 
     /**
-     * The feature id for the '<em><b>Release</b></em>' attribute.
+     * The feature id for the '<em><b>Id</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int DEPENDS_ON_TYPE__RELEASE = 2;
+    int DEPENDS_ON_TYPE__ID = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Revision</b></em>' attribute.
+     * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int DEPENDS_ON_TYPE__REVISION = 3;
+    int DEPENDS_ON_TYPE__PUBLICATION_STAGE = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 1;
 
     /**
-     * The feature id for the '<em><b>Version</b></em>' attribute.
+     * The feature id for the '<em><b>Revision</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int DEPENDS_ON_TYPE__VERSION = 4;
+    int DEPENDS_ON_TYPE__REVISION = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 2;
 
     /**
      * The number of structural features of the '<em>Depends On Type</em>' class.
@@ -213,7 +259,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DEPENDS_ON_TYPE_FEATURE_COUNT = 5;
+    int DEPENDS_ON_TYPE_FEATURE_COUNT = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 3;
 
     /**
      * The number of operations of the '<em>Depends On Type</em>' class.
@@ -222,7 +268,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DEPENDS_ON_TYPE_OPERATION_COUNT = 0;
+    int DEPENDS_ON_TYPE_OPERATION_COUNT = NSD_OBJECT_WITH_VERSION_AND_RELEASE_OPERATION_COUNT + 0;
 
     /**
      * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocumentRootImpl <em>Document Root</em>}' class.
@@ -362,14 +408,14 @@ public interface NsdPackage extends EPackage {
     int SERVICE_TYPE_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationImpl <em>TAbbreviation</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationImpl <em>Abbreviation</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbbreviation()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAbbreviation()
      * @generated
      */
-    int TABBREVIATION = 4;
+    int ABBREVIATION = 4;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -378,7 +424,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABBREVIATION__DESC_ID = 0;
+    int ABBREVIATION__DESC_ID = 0;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -387,35 +433,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABBREVIATION__NAME = 1;
+    int ABBREVIATION__NAME = 1;
 
     /**
-     * The number of structural features of the '<em>TAbbreviation</em>' class.
+     * The number of structural features of the '<em>Abbreviation</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TABBREVIATION_FEATURE_COUNT = 2;
+    int ABBREVIATION_FEATURE_COUNT = 2;
 
     /**
-     * The number of operations of the '<em>TAbbreviation</em>' class.
+     * The number of operations of the '<em>Abbreviation</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TABBREVIATION_OPERATION_COUNT = 0;
+    int ABBREVIATION_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationsImpl <em>TAbbreviations</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationsImpl <em>Abbreviations</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationsImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbbreviations()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationsImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAbbreviations()
      * @generated
      */
-    int TABBREVIATIONS = 5;
+    int ABBREVIATIONS = 5;
 
     /**
      * The feature id for the '<em><b>Abbreviation</b></em>' containment reference list.
@@ -424,35 +470,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABBREVIATIONS__ABBREVIATION = 0;
+    int ABBREVIATIONS__ABBREVIATION = 0;
 
     /**
-     * The number of structural features of the '<em>TAbbreviations</em>' class.
+     * The number of structural features of the '<em>Abbreviations</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TABBREVIATIONS_FEATURE_COUNT = 1;
+    int ABBREVIATIONS_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TAbbreviations</em>' class.
+     * The number of operations of the '<em>Abbreviations</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TABBREVIATIONS_OPERATION_COUNT = 0;
+    int ABBREVIATIONS_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocumentedClassImpl <em>TDocumented Class</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocumentedClassImpl <em>Documented Class</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocumentedClassImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDocumentedClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocumentedClassImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDocumentedClass()
      * @generated
      */
-    int TDOCUMENTED_CLASS = 23;
+    int DOCUMENTED_CLASS = 23;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -461,7 +507,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDOCUMENTED_CLASS__DEPRECATED = 0;
+    int DOCUMENTED_CLASS__DEPRECATED = 0;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -470,7 +516,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDOCUMENTED_CLASS__DESC_ID = 1;
+    int DOCUMENTED_CLASS__DESC_ID = 1;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -479,35 +525,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDOCUMENTED_CLASS__INFORMATIVE = 2;
+    int DOCUMENTED_CLASS__INFORMATIVE = 2;
 
     /**
-     * The number of structural features of the '<em>TDocumented Class</em>' class.
+     * The number of structural features of the '<em>Documented Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDOCUMENTED_CLASS_FEATURE_COUNT = 3;
+    int DOCUMENTED_CLASS_FEATURE_COUNT = 3;
 
     /**
-     * The number of operations of the '<em>TDocumented Class</em>' class.
+     * The number of operations of the '<em>Documented Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDOCUMENTED_CLASS_OPERATION_COUNT = 0;
+    int DOCUMENTED_CLASS_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TTitledClassImpl <em>TTitled Class</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TitledClassImpl <em>Titled Class</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TTitledClassImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTTitledClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TitledClassImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTitledClass()
      * @generated
      */
-    int TTITLED_CLASS = 49;
+    int TITLED_CLASS = 49;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -516,7 +562,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TTITLED_CLASS__DEPRECATED = TDOCUMENTED_CLASS__DEPRECATED;
+    int TITLED_CLASS__DEPRECATED = DOCUMENTED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -525,7 +571,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TTITLED_CLASS__DESC_ID = TDOCUMENTED_CLASS__DESC_ID;
+    int TITLED_CLASS__DESC_ID = DOCUMENTED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -534,7 +580,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TTITLED_CLASS__INFORMATIVE = TDOCUMENTED_CLASS__INFORMATIVE;
+    int TITLED_CLASS__INFORMATIVE = DOCUMENTED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -543,35 +589,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TTITLED_CLASS__TITLE_ID = TDOCUMENTED_CLASS_FEATURE_COUNT + 0;
+    int TITLED_CLASS__TITLE_ID = DOCUMENTED_CLASS_FEATURE_COUNT + 0;
 
     /**
-     * The number of structural features of the '<em>TTitled Class</em>' class.
+     * The number of structural features of the '<em>Titled Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TTITLED_CLASS_FEATURE_COUNT = TDOCUMENTED_CLASS_FEATURE_COUNT + 1;
+    int TITLED_CLASS_FEATURE_COUNT = DOCUMENTED_CLASS_FEATURE_COUNT + 1;
 
     /**
-     * The number of operations of the '<em>TTitled Class</em>' class.
+     * The number of operations of the '<em>Titled Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TTITLED_CLASS_OPERATION_COUNT = TDOCUMENTED_CLASS_OPERATION_COUNT + 0;
+    int TITLED_CLASS_OPERATION_COUNT = DOCUMENTED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAnyLNClassImpl <em>TAny LN Class</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AnyLNClassImpl <em>Any LN Class</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAnyLNClassImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAnyLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AnyLNClassImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAnyLNClass()
      * @generated
      */
-    int TANY_LN_CLASS = 7;
+    int ANY_LN_CLASS = 7;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -580,7 +626,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TANY_LN_CLASS__DEPRECATED = TTITLED_CLASS__DEPRECATED;
+    int ANY_LN_CLASS__DEPRECATED = TITLED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -589,7 +635,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TANY_LN_CLASS__DESC_ID = TTITLED_CLASS__DESC_ID;
+    int ANY_LN_CLASS__DESC_ID = TITLED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -598,7 +644,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TANY_LN_CLASS__INFORMATIVE = TTITLED_CLASS__INFORMATIVE;
+    int ANY_LN_CLASS__INFORMATIVE = TITLED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -607,7 +653,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TANY_LN_CLASS__TITLE_ID = TTITLED_CLASS__TITLE_ID;
+    int ANY_LN_CLASS__TITLE_ID = TITLED_CLASS__TITLE_ID;
 
     /**
      * The feature id for the '<em><b>Data Object</b></em>' containment reference list.
@@ -616,7 +662,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TANY_LN_CLASS__DATA_OBJECT = TTITLED_CLASS_FEATURE_COUNT + 0;
+    int ANY_LN_CLASS__DATA_OBJECT = TITLED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Base</b></em>' attribute.
@@ -625,35 +671,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TANY_LN_CLASS__BASE = TTITLED_CLASS_FEATURE_COUNT + 1;
+    int ANY_LN_CLASS__BASE = TITLED_CLASS_FEATURE_COUNT + 1;
 
     /**
-     * The number of structural features of the '<em>TAny LN Class</em>' class.
+     * The number of structural features of the '<em>Any LN Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TANY_LN_CLASS_FEATURE_COUNT = TTITLED_CLASS_FEATURE_COUNT + 2;
+    int ANY_LN_CLASS_FEATURE_COUNT = TITLED_CLASS_FEATURE_COUNT + 2;
 
     /**
-     * The number of operations of the '<em>TAny LN Class</em>' class.
+     * The number of operations of the '<em>Any LN Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TANY_LN_CLASS_OPERATION_COUNT = TTITLED_CLASS_OPERATION_COUNT + 0;
+    int ANY_LN_CLASS_OPERATION_COUNT = TITLED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbstractLNClassImpl <em>TAbstract LN Class</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbstractLNClassImpl <em>Abstract LN Class</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbstractLNClassImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbstractLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbstractLNClassImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAbstractLNClass()
      * @generated
      */
-    int TABSTRACT_LN_CLASS = 6;
+    int ABSTRACT_LN_CLASS = 6;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -662,7 +708,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABSTRACT_LN_CLASS__DEPRECATED = TANY_LN_CLASS__DEPRECATED;
+    int ABSTRACT_LN_CLASS__DEPRECATED = ANY_LN_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -671,7 +717,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABSTRACT_LN_CLASS__DESC_ID = TANY_LN_CLASS__DESC_ID;
+    int ABSTRACT_LN_CLASS__DESC_ID = ANY_LN_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -680,7 +726,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABSTRACT_LN_CLASS__INFORMATIVE = TANY_LN_CLASS__INFORMATIVE;
+    int ABSTRACT_LN_CLASS__INFORMATIVE = ANY_LN_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -689,7 +735,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABSTRACT_LN_CLASS__TITLE_ID = TANY_LN_CLASS__TITLE_ID;
+    int ABSTRACT_LN_CLASS__TITLE_ID = ANY_LN_CLASS__TITLE_ID;
 
     /**
      * The feature id for the '<em><b>Data Object</b></em>' containment reference list.
@@ -698,7 +744,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABSTRACT_LN_CLASS__DATA_OBJECT = TANY_LN_CLASS__DATA_OBJECT;
+    int ABSTRACT_LN_CLASS__DATA_OBJECT = ANY_LN_CLASS__DATA_OBJECT;
 
     /**
      * The feature id for the '<em><b>Base</b></em>' attribute.
@@ -707,7 +753,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABSTRACT_LN_CLASS__BASE = TANY_LN_CLASS__BASE;
+    int ABSTRACT_LN_CLASS__BASE = ANY_LN_CLASS__BASE;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -716,35 +762,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABSTRACT_LN_CLASS__NAME = TANY_LN_CLASS_FEATURE_COUNT + 0;
+    int ABSTRACT_LN_CLASS__NAME = ANY_LN_CLASS_FEATURE_COUNT + 0;
 
     /**
-     * The number of structural features of the '<em>TAbstract LN Class</em>' class.
+     * The number of structural features of the '<em>Abstract LN Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TABSTRACT_LN_CLASS_FEATURE_COUNT = TANY_LN_CLASS_FEATURE_COUNT + 1;
+    int ABSTRACT_LN_CLASS_FEATURE_COUNT = ANY_LN_CLASS_FEATURE_COUNT + 1;
 
     /**
-     * The number of operations of the '<em>TAbstract LN Class</em>' class.
+     * The number of operations of the '<em>Abstract LN Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TABSTRACT_LN_CLASS_OPERATION_COUNT = TANY_LN_CLASS_OPERATION_COUNT + 0;
+    int ABSTRACT_LN_CLASS_OPERATION_COUNT = ANY_LN_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightedImpl <em>TCopyrighted</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightedImpl <em>Copyrighted</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightedImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCopyrighted()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightedImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCopyrighted()
      * @generated
      */
-    int TCOPYRIGHTED = 17;
+    int COPYRIGHTED = 17;
 
     /**
      * The feature id for the '<em><b>Copyright</b></em>' containment reference.
@@ -753,35 +799,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCOPYRIGHTED__COPYRIGHT = 0;
+    int COPYRIGHTED__COPYRIGHT = 0;
 
     /**
-     * The number of structural features of the '<em>TCopyrighted</em>' class.
+     * The number of structural features of the '<em>Copyrighted</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCOPYRIGHTED_FEATURE_COUNT = 1;
+    int COPYRIGHTED_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TCopyrighted</em>' class.
+     * The number of operations of the '<em>Copyrighted</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCOPYRIGHTED_OPERATION_COUNT = 0;
+    int COPYRIGHTED_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServiceNSImpl <em>TApplicable Service NS</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServiceNSImpl <em>Applicable Service NS</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServiceNSImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTApplicableServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServiceNSImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getApplicableServiceNS()
      * @generated
      */
-    int TAPPLICABLE_SERVICE_NS = 8;
+    int APPLICABLE_SERVICE_NS = 8;
 
     /**
      * The feature id for the '<em><b>Copyright</b></em>' containment reference.
@@ -790,7 +836,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICE_NS__COPYRIGHT = TCOPYRIGHTED__COPYRIGHT;
+    int APPLICABLE_SERVICE_NS__COPYRIGHT = COPYRIGHTED__COPYRIGHT;
 
     /**
      * The feature id for the '<em><b>Service Ns Usage</b></em>' containment reference list.
@@ -799,7 +845,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE = TCOPYRIGHTED_FEATURE_COUNT + 0;
+    int APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE = COPYRIGHTED_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Date</b></em>' attribute.
@@ -808,7 +854,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICE_NS__DATE = TCOPYRIGHTED_FEATURE_COUNT + 1;
+    int APPLICABLE_SERVICE_NS__DATE = COPYRIGHTED_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Version</b></em>' attribute.
@@ -817,35 +863,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICE_NS__VERSION = TCOPYRIGHTED_FEATURE_COUNT + 2;
+    int APPLICABLE_SERVICE_NS__VERSION = COPYRIGHTED_FEATURE_COUNT + 2;
 
     /**
-     * The number of structural features of the '<em>TApplicable Service NS</em>' class.
+     * The number of structural features of the '<em>Applicable Service NS</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICE_NS_FEATURE_COUNT = TCOPYRIGHTED_FEATURE_COUNT + 3;
+    int APPLICABLE_SERVICE_NS_FEATURE_COUNT = COPYRIGHTED_FEATURE_COUNT + 3;
 
     /**
-     * The number of operations of the '<em>TApplicable Service NS</em>' class.
+     * The number of operations of the '<em>Applicable Service NS</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICE_NS_OPERATION_COUNT = TCOPYRIGHTED_OPERATION_COUNT + 0;
+    int APPLICABLE_SERVICE_NS_OPERATION_COUNT = COPYRIGHTED_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServicesImpl <em>TApplicable Services</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServicesImpl <em>Applicable Services</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServicesImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTApplicableServices()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServicesImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getApplicableServices()
      * @generated
      */
-    int TAPPLICABLE_SERVICES = 9;
+    int APPLICABLE_SERVICES = 9;
 
     /**
      * The feature id for the '<em><b>Service</b></em>' containment reference list.
@@ -854,7 +900,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICES__SERVICE = 0;
+    int APPLICABLE_SERVICES__SERVICE = 0;
 
     /**
      * The feature id for the '<em><b>Data Set Member Of</b></em>' containment reference list.
@@ -863,35 +909,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF = 1;
+    int APPLICABLE_SERVICES__DATA_SET_MEMBER_OF = 1;
 
     /**
-     * The number of structural features of the '<em>TApplicable Services</em>' class.
+     * The number of structural features of the '<em>Applicable Services</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICES_FEATURE_COUNT = 2;
+    int APPLICABLE_SERVICES_FEATURE_COUNT = 2;
 
     /**
-     * The number of operations of the '<em>TApplicable Services</em>' class.
+     * The number of operations of the '<em>Applicable Services</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TAPPLICABLE_SERVICES_OPERATION_COUNT = 0;
+    int APPLICABLE_SERVICES_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypeImpl <em>TBasic Type</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypeImpl <em>Basic Type</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypeImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTBasicType()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypeImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getBasicType()
      * @generated
      */
-    int TBASIC_TYPE = 10;
+    int BASIC_TYPE = 10;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -900,7 +946,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TBASIC_TYPE__DESC_ID = 0;
+    int BASIC_TYPE__DESC_ID = 0;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -909,35 +955,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TBASIC_TYPE__NAME = 1;
+    int BASIC_TYPE__NAME = 1;
 
     /**
-     * The number of structural features of the '<em>TBasic Type</em>' class.
+     * The number of structural features of the '<em>Basic Type</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TBASIC_TYPE_FEATURE_COUNT = 2;
+    int BASIC_TYPE_FEATURE_COUNT = 2;
 
     /**
-     * The number of operations of the '<em>TBasic Type</em>' class.
+     * The number of operations of the '<em>Basic Type</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TBASIC_TYPE_OPERATION_COUNT = 0;
+    int BASIC_TYPE_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypesImpl <em>TBasic Types</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypesImpl <em>Basic Types</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypesImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTBasicTypes()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypesImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getBasicTypes()
      * @generated
      */
-    int TBASIC_TYPES = 11;
+    int BASIC_TYPES = 11;
 
     /**
      * The feature id for the '<em><b>Basic Type</b></em>' containment reference list.
@@ -946,35 +992,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TBASIC_TYPES__BASIC_TYPE = 0;
+    int BASIC_TYPES__BASIC_TYPE = 0;
 
     /**
-     * The number of structural features of the '<em>TBasic Types</em>' class.
+     * The number of structural features of the '<em>Basic Types</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TBASIC_TYPES_FEATURE_COUNT = 1;
+    int BASIC_TYPES_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TBasic Types</em>' class.
+     * The number of operations of the '<em>Basic Types</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TBASIC_TYPES_OPERATION_COUNT = 0;
+    int BASIC_TYPES_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl <em>TCDC</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl <em>CDC</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCDC()
      * @generated
      */
-    int TCDC = 12;
+    int CDC = 12;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -983,7 +1029,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__DEPRECATED = TTITLED_CLASS__DEPRECATED;
+    int CDC__DEPRECATED = TITLED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -992,7 +1038,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__DESC_ID = TTITLED_CLASS__DESC_ID;
+    int CDC__DESC_ID = TITLED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -1001,7 +1047,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__INFORMATIVE = TTITLED_CLASS__INFORMATIVE;
+    int CDC__INFORMATIVE = TITLED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -1010,7 +1056,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__TITLE_ID = TTITLED_CLASS__TITLE_ID;
+    int CDC__TITLE_ID = TITLED_CLASS__TITLE_ID;
 
     /**
      * The feature id for the '<em><b>Sub Data Object</b></em>' containment reference list.
@@ -1019,7 +1065,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__SUB_DATA_OBJECT = TTITLED_CLASS_FEATURE_COUNT + 0;
+    int CDC__SUB_DATA_OBJECT = TITLED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Data Attribute</b></em>' containment reference list.
@@ -1028,7 +1074,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__DATA_ATTRIBUTE = TTITLED_CLASS_FEATURE_COUNT + 1;
+    int CDC__DATA_ATTRIBUTE = TITLED_CLASS_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Service Parameter</b></em>' containment reference.
@@ -1037,7 +1083,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__SERVICE_PARAMETER = TTITLED_CLASS_FEATURE_COUNT + 2;
+    int CDC__SERVICE_PARAMETER = TITLED_CLASS_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Enum Parameterized</b></em>' attribute.
@@ -1046,7 +1092,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__ENUM_PARAMETERIZED = TTITLED_CLASS_FEATURE_COUNT + 3;
+    int CDC__ENUM_PARAMETERIZED = TITLED_CLASS_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1055,7 +1101,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__NAME = TTITLED_CLASS_FEATURE_COUNT + 4;
+    int CDC__NAME = TITLED_CLASS_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Statistics</b></em>' attribute.
@@ -1064,7 +1110,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__STATISTICS = TTITLED_CLASS_FEATURE_COUNT + 5;
+    int CDC__STATISTICS = TITLED_CLASS_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Type Kind Parameterized</b></em>' attribute.
@@ -1073,7 +1119,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__TYPE_KIND_PARAMETERIZED = TTITLED_CLASS_FEATURE_COUNT + 6;
+    int CDC__TYPE_KIND_PARAMETERIZED = TITLED_CLASS_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Variant</b></em>' attribute.
@@ -1082,35 +1128,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCDC__VARIANT = TTITLED_CLASS_FEATURE_COUNT + 7;
+    int CDC__VARIANT = TITLED_CLASS_FEATURE_COUNT + 7;
 
     /**
-     * The number of structural features of the '<em>TCDC</em>' class.
+     * The number of structural features of the '<em>CDC</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCDC_FEATURE_COUNT = TTITLED_CLASS_FEATURE_COUNT + 8;
+    int CDC_FEATURE_COUNT = TITLED_CLASS_FEATURE_COUNT + 8;
 
     /**
-     * The number of operations of the '<em>TCDC</em>' class.
+     * The number of operations of the '<em>CDC</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCDC_OPERATION_COUNT = TTITLED_CLASS_OPERATION_COUNT + 0;
+    int CDC_OPERATION_COUNT = TITLED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCsImpl <em>TCD Cs</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCsImpl <em>CD Cs</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCsImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCDCs()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCsImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCDCs()
      * @generated
      */
-    int TCD_CS = 13;
+    int CD_CS = 13;
 
     /**
      * The feature id for the '<em><b>CDC</b></em>' containment reference list.
@@ -1119,117 +1165,117 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCD_CS__CDC = 0;
+    int CD_CS__CDC = 0;
 
     /**
-     * The number of structural features of the '<em>TCD Cs</em>' class.
+     * The number of structural features of the '<em>CD Cs</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCD_CS_FEATURE_COUNT = 1;
+    int CD_CS_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TCD Cs</em>' class.
+     * The number of operations of the '<em>CD Cs</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCD_CS_OPERATION_COUNT = 0;
+    int CD_CS_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl <em>TChanges</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ChangesImpl <em>Changes</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTChanges()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ChangesImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getChanges()
      * @generated
      */
-    int TCHANGES = 14;
+    int CHANGES = 14;
 
     /**
-     * The feature id for the '<em><b>Changes ID</b></em>' attribute.
+     * The feature id for the '<em><b>Release</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCHANGES__CHANGES_ID = 0;
+    int CHANGES__RELEASE = NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE;
 
     /**
-     * The feature id for the '<em><b>Date</b></em>' attribute.
+     * The feature id for the '<em><b>Version</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCHANGES__DATE = 1;
+    int CHANGES__VERSION = NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION;
 
     /**
-     * The feature id for the '<em><b>Release</b></em>' attribute.
+     * The feature id for the '<em><b>Changes ID</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCHANGES__RELEASE = 2;
+    int CHANGES__CHANGES_ID = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Revision</b></em>' attribute.
+     * The feature id for the '<em><b>Date</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCHANGES__REVISION = 3;
+    int CHANGES__DATE = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 1;
 
     /**
-     * The feature id for the '<em><b>Tissues</b></em>' attribute.
+     * The feature id for the '<em><b>Revision</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCHANGES__TISSUES = 4;
+    int CHANGES__REVISION = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 2;
 
     /**
-     * The feature id for the '<em><b>Version</b></em>' attribute.
+     * The feature id for the '<em><b>Tissues</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCHANGES__VERSION = 5;
+    int CHANGES__TISSUES = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 3;
 
     /**
-     * The number of structural features of the '<em>TChanges</em>' class.
+     * The number of structural features of the '<em>Changes</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCHANGES_FEATURE_COUNT = 6;
+    int CHANGES_FEATURE_COUNT = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 4;
 
     /**
-     * The number of operations of the '<em>TChanges</em>' class.
+     * The number of operations of the '<em>Changes</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCHANGES_OPERATION_COUNT = 0;
+    int CHANGES_OPERATION_COUNT = NSD_OBJECT_WITH_VERSION_AND_RELEASE_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributeImpl <em>TConstructed Attribute</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributeImpl <em>Constructed Attribute</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributeImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTConstructedAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributeImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getConstructedAttribute()
      * @generated
      */
-    int TCONSTRUCTED_ATTRIBUTE = 15;
+    int CONSTRUCTED_ATTRIBUTE = 15;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -1238,7 +1284,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTE__DEPRECATED = TTITLED_CLASS__DEPRECATED;
+    int CONSTRUCTED_ATTRIBUTE__DEPRECATED = TITLED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -1247,7 +1293,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTE__DESC_ID = TTITLED_CLASS__DESC_ID;
+    int CONSTRUCTED_ATTRIBUTE__DESC_ID = TITLED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -1256,7 +1302,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTE__INFORMATIVE = TTITLED_CLASS__INFORMATIVE;
+    int CONSTRUCTED_ATTRIBUTE__INFORMATIVE = TITLED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -1265,7 +1311,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTE__TITLE_ID = TTITLED_CLASS__TITLE_ID;
+    int CONSTRUCTED_ATTRIBUTE__TITLE_ID = TITLED_CLASS__TITLE_ID;
 
     /**
      * The feature id for the '<em><b>Sub Data Attribute</b></em>' containment reference list.
@@ -1274,7 +1320,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE = TTITLED_CLASS_FEATURE_COUNT + 0;
+    int CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE = TITLED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1283,35 +1329,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTE__NAME = TTITLED_CLASS_FEATURE_COUNT + 1;
+    int CONSTRUCTED_ATTRIBUTE__NAME = TITLED_CLASS_FEATURE_COUNT + 1;
 
     /**
-     * The number of structural features of the '<em>TConstructed Attribute</em>' class.
+     * The number of structural features of the '<em>Constructed Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTE_FEATURE_COUNT = TTITLED_CLASS_FEATURE_COUNT + 2;
+    int CONSTRUCTED_ATTRIBUTE_FEATURE_COUNT = TITLED_CLASS_FEATURE_COUNT + 2;
 
     /**
-     * The number of operations of the '<em>TConstructed Attribute</em>' class.
+     * The number of operations of the '<em>Constructed Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTE_OPERATION_COUNT = TTITLED_CLASS_OPERATION_COUNT + 0;
+    int CONSTRUCTED_ATTRIBUTE_OPERATION_COUNT = TITLED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributesImpl <em>TConstructed Attributes</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributesImpl <em>Constructed Attributes</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributesImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTConstructedAttributes()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributesImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getConstructedAttributes()
      * @generated
      */
-    int TCONSTRUCTED_ATTRIBUTES = 16;
+    int CONSTRUCTED_ATTRIBUTES = 16;
 
     /**
      * The feature id for the '<em><b>Constructed Attribute</b></em>' containment reference list.
@@ -1320,35 +1366,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE = 0;
+    int CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE = 0;
 
     /**
-     * The number of structural features of the '<em>TConstructed Attributes</em>' class.
+     * The number of structural features of the '<em>Constructed Attributes</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTES_FEATURE_COUNT = 1;
+    int CONSTRUCTED_ATTRIBUTES_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TConstructed Attributes</em>' class.
+     * The number of operations of the '<em>Constructed Attributes</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCONSTRUCTED_ATTRIBUTES_OPERATION_COUNT = 0;
+    int CONSTRUCTED_ATTRIBUTES_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightNoticeImpl <em>TCopyright Notice</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightNoticeImpl <em>Copyright Notice</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightNoticeImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCopyrightNotice()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightNoticeImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCopyrightNotice()
      * @generated
      */
-    int TCOPYRIGHT_NOTICE = 18;
+    int COPYRIGHT_NOTICE = 18;
 
     /**
      * The feature id for the '<em><b>Notice</b></em>' containment reference.
@@ -1357,7 +1403,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCOPYRIGHT_NOTICE__NOTICE = 0;
+    int COPYRIGHT_NOTICE__NOTICE = 0;
 
     /**
      * The feature id for the '<em><b>License</b></em>' containment reference.
@@ -1366,35 +1412,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TCOPYRIGHT_NOTICE__LICENSE = 1;
+    int COPYRIGHT_NOTICE__LICENSE = 1;
 
     /**
-     * The number of structural features of the '<em>TCopyright Notice</em>' class.
+     * The number of structural features of the '<em>Copyright Notice</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCOPYRIGHT_NOTICE_FEATURE_COUNT = 2;
+    int COPYRIGHT_NOTICE_FEATURE_COUNT = 2;
 
     /**
-     * The number of operations of the '<em>TCopyright Notice</em>' class.
+     * The number of operations of the '<em>Copyright Notice</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TCOPYRIGHT_NOTICE_OPERATION_COUNT = 0;
+    int COPYRIGHT_NOTICE_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl <em>TData Attribute</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl <em>Data Attribute</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDataAttribute()
      * @generated
      */
-    int TDATA_ATTRIBUTE = 19;
+    int DATA_ATTRIBUTE = 19;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -1403,7 +1449,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__DEPRECATED = TDOCUMENTED_CLASS__DEPRECATED;
+    int DATA_ATTRIBUTE__DEPRECATED = DOCUMENTED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -1412,7 +1458,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__DESC_ID = TDOCUMENTED_CLASS__DESC_ID;
+    int DATA_ATTRIBUTE__DESC_ID = DOCUMENTED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -1421,7 +1467,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__INFORMATIVE = TDOCUMENTED_CLASS__INFORMATIVE;
+    int DATA_ATTRIBUTE__INFORMATIVE = DOCUMENTED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Dchg</b></em>' attribute.
@@ -1430,7 +1476,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__DCHG = TDOCUMENTED_CLASS_FEATURE_COUNT + 0;
+    int DATA_ATTRIBUTE__DCHG = DOCUMENTED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Default Value</b></em>' attribute.
@@ -1439,7 +1485,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__DEFAULT_VALUE = TDOCUMENTED_CLASS_FEATURE_COUNT + 1;
+    int DATA_ATTRIBUTE__DEFAULT_VALUE = DOCUMENTED_CLASS_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Dupd</b></em>' attribute.
@@ -1448,7 +1494,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__DUPD = TDOCUMENTED_CLASS_FEATURE_COUNT + 2;
+    int DATA_ATTRIBUTE__DUPD = DOCUMENTED_CLASS_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Fc</b></em>' attribute.
@@ -1457,7 +1503,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__FC = TDOCUMENTED_CLASS_FEATURE_COUNT + 3;
+    int DATA_ATTRIBUTE__FC = DOCUMENTED_CLASS_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Is Array</b></em>' attribute.
@@ -1466,7 +1512,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__IS_ARRAY = TDOCUMENTED_CLASS_FEATURE_COUNT + 4;
+    int DATA_ATTRIBUTE__IS_ARRAY = DOCUMENTED_CLASS_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Max Index Attribute</b></em>' attribute.
@@ -1475,7 +1521,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE = TDOCUMENTED_CLASS_FEATURE_COUNT + 5;
+    int DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE = DOCUMENTED_CLASS_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Max Value</b></em>' attribute.
@@ -1484,7 +1530,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__MAX_VALUE = TDOCUMENTED_CLASS_FEATURE_COUNT + 6;
+    int DATA_ATTRIBUTE__MAX_VALUE = DOCUMENTED_CLASS_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Min Index</b></em>' attribute.
@@ -1493,7 +1539,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__MIN_INDEX = TDOCUMENTED_CLASS_FEATURE_COUNT + 7;
+    int DATA_ATTRIBUTE__MIN_INDEX = DOCUMENTED_CLASS_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Min Value</b></em>' attribute.
@@ -1502,7 +1548,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__MIN_VALUE = TDOCUMENTED_CLASS_FEATURE_COUNT + 8;
+    int DATA_ATTRIBUTE__MIN_VALUE = DOCUMENTED_CLASS_FEATURE_COUNT + 8;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1511,7 +1557,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__NAME = TDOCUMENTED_CLASS_FEATURE_COUNT + 9;
+    int DATA_ATTRIBUTE__NAME = DOCUMENTED_CLASS_FEATURE_COUNT + 9;
 
     /**
      * The feature id for the '<em><b>Pres Cond</b></em>' attribute.
@@ -1520,7 +1566,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__PRES_COND = TDOCUMENTED_CLASS_FEATURE_COUNT + 10;
+    int DATA_ATTRIBUTE__PRES_COND = DOCUMENTED_CLASS_FEATURE_COUNT + 10;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args</b></em>' attribute.
@@ -1529,7 +1575,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__PRES_COND_ARGS = TDOCUMENTED_CLASS_FEATURE_COUNT + 11;
+    int DATA_ATTRIBUTE__PRES_COND_ARGS = DOCUMENTED_CLASS_FEATURE_COUNT + 11;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args ID</b></em>' attribute.
@@ -1538,7 +1584,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__PRES_COND_ARGS_ID = TDOCUMENTED_CLASS_FEATURE_COUNT + 12;
+    int DATA_ATTRIBUTE__PRES_COND_ARGS_ID = DOCUMENTED_CLASS_FEATURE_COUNT + 12;
 
     /**
      * The feature id for the '<em><b>Qchg</b></em>' attribute.
@@ -1547,7 +1593,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__QCHG = TDOCUMENTED_CLASS_FEATURE_COUNT + 13;
+    int DATA_ATTRIBUTE__QCHG = DOCUMENTED_CLASS_FEATURE_COUNT + 13;
 
     /**
      * The feature id for the '<em><b>Size Attribute</b></em>' attribute.
@@ -1556,7 +1602,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__SIZE_ATTRIBUTE = TDOCUMENTED_CLASS_FEATURE_COUNT + 14;
+    int DATA_ATTRIBUTE__SIZE_ATTRIBUTE = DOCUMENTED_CLASS_FEATURE_COUNT + 14;
 
     /**
      * The feature id for the '<em><b>Type</b></em>' attribute.
@@ -1565,7 +1611,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__TYPE = TDOCUMENTED_CLASS_FEATURE_COUNT + 15;
+    int DATA_ATTRIBUTE__TYPE = DOCUMENTED_CLASS_FEATURE_COUNT + 15;
 
     /**
      * The feature id for the '<em><b>Type Kind</b></em>' attribute.
@@ -1574,35 +1620,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE__TYPE_KIND = TDOCUMENTED_CLASS_FEATURE_COUNT + 16;
+    int DATA_ATTRIBUTE__TYPE_KIND = DOCUMENTED_CLASS_FEATURE_COUNT + 16;
 
     /**
-     * The number of structural features of the '<em>TData Attribute</em>' class.
+     * The number of structural features of the '<em>Data Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE_FEATURE_COUNT = TDOCUMENTED_CLASS_FEATURE_COUNT + 17;
+    int DATA_ATTRIBUTE_FEATURE_COUNT = DOCUMENTED_CLASS_FEATURE_COUNT + 17;
 
     /**
-     * The number of operations of the '<em>TData Attribute</em>' class.
+     * The number of operations of the '<em>Data Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDATA_ATTRIBUTE_OPERATION_COUNT = TDOCUMENTED_CLASS_OPERATION_COUNT + 0;
+    int DATA_ATTRIBUTE_OPERATION_COUNT = DOCUMENTED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl <em>TData Object</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl <em>Data Object</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDataObject()
      * @generated
      */
-    int TDATA_OBJECT = 20;
+    int DATA_OBJECT = 20;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -1611,7 +1657,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__DEPRECATED = TDOCUMENTED_CLASS__DEPRECATED;
+    int DATA_OBJECT__DEPRECATED = DOCUMENTED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -1620,7 +1666,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__DESC_ID = TDOCUMENTED_CLASS__DESC_ID;
+    int DATA_OBJECT__DESC_ID = DOCUMENTED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -1629,7 +1675,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__INFORMATIVE = TDOCUMENTED_CLASS__INFORMATIVE;
+    int DATA_OBJECT__INFORMATIVE = DOCUMENTED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Ds Pres Cond</b></em>' attribute.
@@ -1638,7 +1684,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__DS_PRES_COND = TDOCUMENTED_CLASS_FEATURE_COUNT + 0;
+    int DATA_OBJECT__DS_PRES_COND = DOCUMENTED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Ds Pres Cond Args</b></em>' attribute.
@@ -1647,7 +1693,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__DS_PRES_COND_ARGS = TDOCUMENTED_CLASS_FEATURE_COUNT + 1;
+    int DATA_OBJECT__DS_PRES_COND_ARGS = DOCUMENTED_CLASS_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Ds Pres Cond Args ID</b></em>' attribute.
@@ -1656,7 +1702,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__DS_PRES_COND_ARGS_ID = TDOCUMENTED_CLASS_FEATURE_COUNT + 2;
+    int DATA_OBJECT__DS_PRES_COND_ARGS_ID = DOCUMENTED_CLASS_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1665,7 +1711,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__NAME = TDOCUMENTED_CLASS_FEATURE_COUNT + 3;
+    int DATA_OBJECT__NAME = DOCUMENTED_CLASS_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Pres Cond</b></em>' attribute.
@@ -1674,7 +1720,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__PRES_COND = TDOCUMENTED_CLASS_FEATURE_COUNT + 4;
+    int DATA_OBJECT__PRES_COND = DOCUMENTED_CLASS_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args</b></em>' attribute.
@@ -1683,7 +1729,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__PRES_COND_ARGS = TDOCUMENTED_CLASS_FEATURE_COUNT + 5;
+    int DATA_OBJECT__PRES_COND_ARGS = DOCUMENTED_CLASS_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args ID</b></em>' attribute.
@@ -1692,7 +1738,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__PRES_COND_ARGS_ID = TDOCUMENTED_CLASS_FEATURE_COUNT + 6;
+    int DATA_OBJECT__PRES_COND_ARGS_ID = DOCUMENTED_CLASS_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Transient</b></em>' attribute.
@@ -1701,7 +1747,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__TRANSIENT = TDOCUMENTED_CLASS_FEATURE_COUNT + 7;
+    int DATA_OBJECT__TRANSIENT = DOCUMENTED_CLASS_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Type</b></em>' attribute.
@@ -1710,7 +1756,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__TYPE = TDOCUMENTED_CLASS_FEATURE_COUNT + 8;
+    int DATA_OBJECT__TYPE = DOCUMENTED_CLASS_FEATURE_COUNT + 8;
 
     /**
      * The feature id for the '<em><b>Underlying Type</b></em>' attribute.
@@ -1719,7 +1765,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__UNDERLYING_TYPE = TDOCUMENTED_CLASS_FEATURE_COUNT + 9;
+    int DATA_OBJECT__UNDERLYING_TYPE = DOCUMENTED_CLASS_FEATURE_COUNT + 9;
 
     /**
      * The feature id for the '<em><b>Underlying Type Kind</b></em>' attribute.
@@ -1728,35 +1774,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT__UNDERLYING_TYPE_KIND = TDOCUMENTED_CLASS_FEATURE_COUNT + 10;
+    int DATA_OBJECT__UNDERLYING_TYPE_KIND = DOCUMENTED_CLASS_FEATURE_COUNT + 10;
 
     /**
-     * The number of structural features of the '<em>TData Object</em>' class.
+     * The number of structural features of the '<em>Data Object</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT_FEATURE_COUNT = TDOCUMENTED_CLASS_FEATURE_COUNT + 11;
+    int DATA_OBJECT_FEATURE_COUNT = DOCUMENTED_CLASS_FEATURE_COUNT + 11;
 
     /**
-     * The number of operations of the '<em>TData Object</em>' class.
+     * The number of operations of the '<em>Data Object</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDATA_OBJECT_OPERATION_COUNT = TDOCUMENTED_CLASS_OPERATION_COUNT + 0;
+    int DATA_OBJECT_OPERATION_COUNT = DOCUMENTED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataSetMemberOfImpl <em>TData Set Member Of</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataSetMemberOfImpl <em>Data Set Member Of</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataSetMemberOfImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDataSetMemberOf()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataSetMemberOfImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDataSetMemberOf()
      * @generated
      */
-    int TDATA_SET_MEMBER_OF = 21;
+    int DATA_SET_MEMBER_OF = 21;
 
     /**
      * The feature id for the '<em><b>Cb</b></em>' attribute.
@@ -1765,35 +1811,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDATA_SET_MEMBER_OF__CB = 0;
+    int DATA_SET_MEMBER_OF__CB = 0;
 
     /**
-     * The number of structural features of the '<em>TData Set Member Of</em>' class.
+     * The number of structural features of the '<em>Data Set Member Of</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDATA_SET_MEMBER_OF_FEATURE_COUNT = 1;
+    int DATA_SET_MEMBER_OF_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TData Set Member Of</em>' class.
+     * The number of operations of the '<em>Data Set Member Of</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDATA_SET_MEMBER_OF_OPERATION_COUNT = 0;
+    int DATA_SET_MEMBER_OF_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocImpl <em>TDoc</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocImpl <em>Doc</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDoc()
      * @generated
      */
-    int TDOC = 22;
+    int DOC = 22;
 
     /**
      * The feature id for the '<em><b>Mixed</b></em>' attribute list.
@@ -1802,7 +1848,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDOC__MIXED = 0;
+    int DOC__MIXED = 0;
 
     /**
      * The feature id for the '<em><b>Group</b></em>' attribute list.
@@ -1811,7 +1857,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDOC__GROUP = 1;
+    int DOC__GROUP = 1;
 
     /**
      * The feature id for the '<em><b>Any</b></em>' attribute list.
@@ -1820,7 +1866,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDOC__ANY = 2;
+    int DOC__ANY = 2;
 
     /**
      * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -1829,35 +1875,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TDOC__ID = 3;
+    int DOC__ID = 3;
 
     /**
-     * The number of structural features of the '<em>TDoc</em>' class.
+     * The number of structural features of the '<em>Doc</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDOC_FEATURE_COUNT = 4;
+    int DOC_FEATURE_COUNT = 4;
 
     /**
-     * The number of operations of the '<em>TDoc</em>' class.
+     * The number of operations of the '<em>Doc</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TDOC_OPERATION_COUNT = 0;
+    int DOC_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationImpl <em>TEnumeration</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationImpl <em>Enumeration</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTEnumeration()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getEnumeration()
      * @generated
      */
-    int TENUMERATION = 24;
+    int ENUMERATION = 24;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -1866,7 +1912,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TENUMERATION__DEPRECATED = TTITLED_CLASS__DEPRECATED;
+    int ENUMERATION__DEPRECATED = TITLED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -1875,7 +1921,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TENUMERATION__DESC_ID = TTITLED_CLASS__DESC_ID;
+    int ENUMERATION__DESC_ID = TITLED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -1884,7 +1930,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TENUMERATION__INFORMATIVE = TTITLED_CLASS__INFORMATIVE;
+    int ENUMERATION__INFORMATIVE = TITLED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -1893,7 +1939,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TENUMERATION__TITLE_ID = TTITLED_CLASS__TITLE_ID;
+    int ENUMERATION__TITLE_ID = TITLED_CLASS__TITLE_ID;
 
     /**
      * The feature id for the '<em><b>Literal</b></em>' containment reference list.
@@ -1902,7 +1948,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TENUMERATION__LITERAL = TTITLED_CLASS_FEATURE_COUNT + 0;
+    int ENUMERATION__LITERAL = TITLED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Inherited From</b></em>' attribute.
@@ -1911,7 +1957,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TENUMERATION__INHERITED_FROM = TTITLED_CLASS_FEATURE_COUNT + 1;
+    int ENUMERATION__INHERITED_FROM = TITLED_CLASS_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1920,35 +1966,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TENUMERATION__NAME = TTITLED_CLASS_FEATURE_COUNT + 2;
+    int ENUMERATION__NAME = TITLED_CLASS_FEATURE_COUNT + 2;
 
     /**
-     * The number of structural features of the '<em>TEnumeration</em>' class.
+     * The number of structural features of the '<em>Enumeration</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TENUMERATION_FEATURE_COUNT = TTITLED_CLASS_FEATURE_COUNT + 3;
+    int ENUMERATION_FEATURE_COUNT = TITLED_CLASS_FEATURE_COUNT + 3;
 
     /**
-     * The number of operations of the '<em>TEnumeration</em>' class.
+     * The number of operations of the '<em>Enumeration</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TENUMERATION_OPERATION_COUNT = TTITLED_CLASS_OPERATION_COUNT + 0;
+    int ENUMERATION_OPERATION_COUNT = TITLED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationsImpl <em>TEnumerations</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationsImpl <em>Enumerations</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationsImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTEnumerations()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationsImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getEnumerations()
      * @generated
      */
-    int TENUMERATIONS = 25;
+    int ENUMERATIONS = 25;
 
     /**
      * The feature id for the '<em><b>Enumeration</b></em>' containment reference list.
@@ -1957,35 +2003,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TENUMERATIONS__ENUMERATION = 0;
+    int ENUMERATIONS__ENUMERATION = 0;
 
     /**
-     * The number of structural features of the '<em>TEnumerations</em>' class.
+     * The number of structural features of the '<em>Enumerations</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TENUMERATIONS_FEATURE_COUNT = 1;
+    int ENUMERATIONS_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TEnumerations</em>' class.
+     * The number of operations of the '<em>Enumerations</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TENUMERATIONS_OPERATION_COUNT = 0;
+    int ENUMERATIONS_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintImpl <em>TFunctional Constraint</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintImpl <em>Functional Constraint</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTFunctionalConstraint()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getFunctionalConstraint()
      * @generated
      */
-    int TFUNCTIONAL_CONSTRAINT = 26;
+    int FUNCTIONAL_CONSTRAINT = 26;
 
     /**
      * The feature id for the '<em><b>Applicable Services</b></em>' containment reference.
@@ -1994,7 +2040,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES = 0;
+    int FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES = 0;
 
     /**
      * The feature id for the '<em><b>Abbreviation</b></em>' attribute.
@@ -2003,7 +2049,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TFUNCTIONAL_CONSTRAINT__ABBREVIATION = 1;
+    int FUNCTIONAL_CONSTRAINT__ABBREVIATION = 1;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -2012,7 +2058,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TFUNCTIONAL_CONSTRAINT__DESC_ID = 2;
+    int FUNCTIONAL_CONSTRAINT__DESC_ID = 2;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -2021,35 +2067,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TFUNCTIONAL_CONSTRAINT__TITLE_ID = 3;
+    int FUNCTIONAL_CONSTRAINT__TITLE_ID = 3;
 
     /**
-     * The number of structural features of the '<em>TFunctional Constraint</em>' class.
+     * The number of structural features of the '<em>Functional Constraint</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TFUNCTIONAL_CONSTRAINT_FEATURE_COUNT = 4;
+    int FUNCTIONAL_CONSTRAINT_FEATURE_COUNT = 4;
 
     /**
-     * The number of operations of the '<em>TFunctional Constraint</em>' class.
+     * The number of operations of the '<em>Functional Constraint</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TFUNCTIONAL_CONSTRAINT_OPERATION_COUNT = 0;
+    int FUNCTIONAL_CONSTRAINT_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintsImpl <em>TFunctional Constraints</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintsImpl <em>Functional Constraints</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintsImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTFunctionalConstraints()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintsImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getFunctionalConstraints()
      * @generated
      */
-    int TFUNCTIONAL_CONSTRAINTS = 27;
+    int FUNCTIONAL_CONSTRAINTS = 27;
 
     /**
      * The feature id for the '<em><b>Functional Constraint</b></em>' containment reference list.
@@ -2058,35 +2104,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT = 0;
+    int FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT = 0;
 
     /**
-     * The number of structural features of the '<em>TFunctional Constraints</em>' class.
+     * The number of structural features of the '<em>Functional Constraints</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TFUNCTIONAL_CONSTRAINTS_FEATURE_COUNT = 1;
+    int FUNCTIONAL_CONSTRAINTS_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TFunctional Constraints</em>' class.
+     * The number of operations of the '<em>Functional Constraints</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TFUNCTIONAL_CONSTRAINTS_OPERATION_COUNT = 0;
+    int FUNCTIONAL_CONSTRAINTS_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLicenseImpl <em>TLicense</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LicenseImpl <em>License</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLicenseImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLicense()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LicenseImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLicense()
      * @generated
      */
-    int TLICENSE = 28;
+    int LICENSE = 28;
 
     /**
      * The feature id for the '<em><b>Mixed</b></em>' attribute list.
@@ -2095,7 +2141,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLICENSE__MIXED = 0;
+    int LICENSE__MIXED = 0;
 
     /**
      * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -2104,7 +2150,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLICENSE__KIND = 1;
+    int LICENSE__KIND = 1;
 
     /**
      * The feature id for the '<em><b>Uri</b></em>' attribute.
@@ -2113,35 +2159,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLICENSE__URI = 2;
+    int LICENSE__URI = 2;
 
     /**
-     * The number of structural features of the '<em>TLicense</em>' class.
+     * The number of structural features of the '<em>License</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TLICENSE_FEATURE_COUNT = 3;
+    int LICENSE_FEATURE_COUNT = 3;
 
     /**
-     * The number of operations of the '<em>TLicense</em>' class.
+     * The number of operations of the '<em>License</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TLICENSE_OPERATION_COUNT = 0;
+    int LICENSE_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLiteralImpl <em>TLiteral</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LiteralImpl <em>Literal</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLiteralImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLiteral()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LiteralImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLiteral()
      * @generated
      */
-    int TLITERAL = 29;
+    int LITERAL = 29;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -2150,7 +2196,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLITERAL__DEPRECATED = TDOCUMENTED_CLASS__DEPRECATED;
+    int LITERAL__DEPRECATED = DOCUMENTED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -2159,7 +2205,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLITERAL__DESC_ID = TDOCUMENTED_CLASS__DESC_ID;
+    int LITERAL__DESC_ID = DOCUMENTED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -2168,7 +2214,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLITERAL__INFORMATIVE = TDOCUMENTED_CLASS__INFORMATIVE;
+    int LITERAL__INFORMATIVE = DOCUMENTED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Literal Val</b></em>' attribute.
@@ -2177,7 +2223,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLITERAL__LITERAL_VAL = TDOCUMENTED_CLASS_FEATURE_COUNT + 0;
+    int LITERAL__LITERAL_VAL = DOCUMENTED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -2186,35 +2232,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLITERAL__NAME = TDOCUMENTED_CLASS_FEATURE_COUNT + 1;
+    int LITERAL__NAME = DOCUMENTED_CLASS_FEATURE_COUNT + 1;
 
     /**
-     * The number of structural features of the '<em>TLiteral</em>' class.
+     * The number of structural features of the '<em>Literal</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TLITERAL_FEATURE_COUNT = TDOCUMENTED_CLASS_FEATURE_COUNT + 2;
+    int LITERAL_FEATURE_COUNT = DOCUMENTED_CLASS_FEATURE_COUNT + 2;
 
     /**
-     * The number of operations of the '<em>TLiteral</em>' class.
+     * The number of operations of the '<em>Literal</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TLITERAL_OPERATION_COUNT = TDOCUMENTED_CLASS_OPERATION_COUNT + 0;
+    int LITERAL_OPERATION_COUNT = DOCUMENTED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassImpl <em>TLN Class</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassImpl <em>LN Class</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLNClass()
      * @generated
      */
-    int TLN_CLASS = 30;
+    int LN_CLASS = 30;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -2223,7 +2269,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASS__DEPRECATED = TANY_LN_CLASS__DEPRECATED;
+    int LN_CLASS__DEPRECATED = ANY_LN_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -2232,7 +2278,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASS__DESC_ID = TANY_LN_CLASS__DESC_ID;
+    int LN_CLASS__DESC_ID = ANY_LN_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -2241,7 +2287,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASS__INFORMATIVE = TANY_LN_CLASS__INFORMATIVE;
+    int LN_CLASS__INFORMATIVE = ANY_LN_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -2250,7 +2296,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASS__TITLE_ID = TANY_LN_CLASS__TITLE_ID;
+    int LN_CLASS__TITLE_ID = ANY_LN_CLASS__TITLE_ID;
 
     /**
      * The feature id for the '<em><b>Data Object</b></em>' containment reference list.
@@ -2259,7 +2305,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASS__DATA_OBJECT = TANY_LN_CLASS__DATA_OBJECT;
+    int LN_CLASS__DATA_OBJECT = ANY_LN_CLASS__DATA_OBJECT;
 
     /**
      * The feature id for the '<em><b>Base</b></em>' attribute.
@@ -2268,7 +2314,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASS__BASE = TANY_LN_CLASS__BASE;
+    int LN_CLASS__BASE = ANY_LN_CLASS__BASE;
 
     /**
      * The feature id for the '<em><b>Can Have LOG</b></em>' attribute.
@@ -2277,7 +2323,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASS__CAN_HAVE_LOG = TANY_LN_CLASS_FEATURE_COUNT + 0;
+    int LN_CLASS__CAN_HAVE_LOG = ANY_LN_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Is Extension</b></em>' attribute.
@@ -2286,7 +2332,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASS__IS_EXTENSION = TANY_LN_CLASS_FEATURE_COUNT + 1;
+    int LN_CLASS__IS_EXTENSION = ANY_LN_CLASS_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -2295,35 +2341,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASS__NAME = TANY_LN_CLASS_FEATURE_COUNT + 2;
+    int LN_CLASS__NAME = ANY_LN_CLASS_FEATURE_COUNT + 2;
 
     /**
-     * The number of structural features of the '<em>TLN Class</em>' class.
+     * The number of structural features of the '<em>LN Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TLN_CLASS_FEATURE_COUNT = TANY_LN_CLASS_FEATURE_COUNT + 3;
+    int LN_CLASS_FEATURE_COUNT = ANY_LN_CLASS_FEATURE_COUNT + 3;
 
     /**
-     * The number of operations of the '<em>TLN Class</em>' class.
+     * The number of operations of the '<em>LN Class</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TLN_CLASS_OPERATION_COUNT = TANY_LN_CLASS_OPERATION_COUNT + 0;
+    int LN_CLASS_OPERATION_COUNT = ANY_LN_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassesImpl <em>TLN Classes</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassesImpl <em>LN Classes</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassesImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLNClasses()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassesImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLNClasses()
      * @generated
      */
-    int TLN_CLASSES = 31;
+    int LN_CLASSES = 31;
 
     /**
      * The feature id for the '<em><b>Abstract LN Class</b></em>' containment reference list.
@@ -2332,7 +2378,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASSES__ABSTRACT_LN_CLASS = 0;
+    int LN_CLASSES__ABSTRACT_LN_CLASS = 0;
 
     /**
      * The feature id for the '<em><b>LN Class</b></em>' containment reference list.
@@ -2341,35 +2387,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TLN_CLASSES__LN_CLASS = 1;
+    int LN_CLASSES__LN_CLASS = 1;
 
     /**
-     * The number of structural features of the '<em>TLN Classes</em>' class.
+     * The number of structural features of the '<em>LN Classes</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TLN_CLASSES_FEATURE_COUNT = 2;
+    int LN_CLASSES_FEATURE_COUNT = 2;
 
     /**
-     * The number of operations of the '<em>TLN Classes</em>' class.
+     * The number of operations of the '<em>LN Classes</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TLN_CLASSES_OPERATION_COUNT = 0;
+    int LN_CLASSES_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNoticeImpl <em>TNotice</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NoticeImpl <em>Notice</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNoticeImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNotice()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NoticeImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getNotice()
      * @generated
      */
-    int TNOTICE = 32;
+    int NOTICE = 32;
 
     /**
      * The feature id for the '<em><b>Mixed</b></em>' attribute list.
@@ -2378,35 +2424,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNOTICE__MIXED = 0;
+    int NOTICE__MIXED = 0;
 
     /**
-     * The number of structural features of the '<em>TNotice</em>' class.
+     * The number of structural features of the '<em>Notice</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNOTICE_FEATURE_COUNT = 1;
+    int NOTICE_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TNotice</em>' class.
+     * The number of operations of the '<em>Notice</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNOTICE_OPERATION_COUNT = 0;
+    int NOTICE_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl <em>TNS</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl <em>NS</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getNS()
      * @generated
      */
-    int TNS = 33;
+    int NS = 33;
 
     /**
      * The feature id for the '<em><b>Copyright</b></em>' containment reference.
@@ -2415,7 +2461,25 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__COPYRIGHT = TCOPYRIGHTED__COPYRIGHT;
+    int NS__COPYRIGHT = COPYRIGHTED__COPYRIGHT;
+
+    /**
+     * The feature id for the '<em><b>Release</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int NS__RELEASE = COPYRIGHTED_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Version</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int NS__VERSION = COPYRIGHTED_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Changes</b></em>' containment reference.
@@ -2424,7 +2488,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__CHANGES = TCOPYRIGHTED_FEATURE_COUNT + 0;
+    int NS__CHANGES = COPYRIGHTED_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Depends On</b></em>' containment reference.
@@ -2433,7 +2497,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__DEPENDS_ON = TCOPYRIGHTED_FEATURE_COUNT + 1;
+    int NS__DEPENDS_ON = COPYRIGHTED_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Basic Types</b></em>' containment reference.
@@ -2442,7 +2506,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__BASIC_TYPES = TCOPYRIGHTED_FEATURE_COUNT + 2;
+    int NS__BASIC_TYPES = COPYRIGHTED_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Functional Constraints</b></em>' containment reference.
@@ -2451,7 +2515,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__FUNCTIONAL_CONSTRAINTS = TCOPYRIGHTED_FEATURE_COUNT + 3;
+    int NS__FUNCTIONAL_CONSTRAINTS = COPYRIGHTED_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Presence Conditions</b></em>' containment reference.
@@ -2460,7 +2524,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__PRESENCE_CONDITIONS = TCOPYRIGHTED_FEATURE_COUNT + 4;
+    int NS__PRESENCE_CONDITIONS = COPYRIGHTED_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Abbreviations</b></em>' containment reference.
@@ -2469,7 +2533,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__ABBREVIATIONS = TCOPYRIGHTED_FEATURE_COUNT + 5;
+    int NS__ABBREVIATIONS = COPYRIGHTED_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Enumerations</b></em>' containment reference.
@@ -2478,7 +2542,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__ENUMERATIONS = TCOPYRIGHTED_FEATURE_COUNT + 6;
+    int NS__ENUMERATIONS = COPYRIGHTED_FEATURE_COUNT + 8;
 
     /**
      * The feature id for the '<em><b>Constructed Attributes</b></em>' containment reference.
@@ -2487,7 +2551,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__CONSTRUCTED_ATTRIBUTES = TCOPYRIGHTED_FEATURE_COUNT + 7;
+    int NS__CONSTRUCTED_ATTRIBUTES = COPYRIGHTED_FEATURE_COUNT + 9;
 
     /**
      * The feature id for the '<em><b>CD Cs</b></em>' containment reference.
@@ -2496,7 +2560,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__CD_CS = TCOPYRIGHTED_FEATURE_COUNT + 8;
+    int NS__CD_CS = COPYRIGHTED_FEATURE_COUNT + 10;
 
     /**
      * The feature id for the '<em><b>LN Classes</b></em>' containment reference.
@@ -2505,7 +2569,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__LN_CLASSES = TCOPYRIGHTED_FEATURE_COUNT + 9;
+    int NS__LN_CLASSES = COPYRIGHTED_FEATURE_COUNT + 11;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -2514,7 +2578,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__DESC_ID = TCOPYRIGHTED_FEATURE_COUNT + 10;
+    int NS__DESC_ID = COPYRIGHTED_FEATURE_COUNT + 12;
 
     /**
      * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -2523,7 +2587,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__ID = TCOPYRIGHTED_FEATURE_COUNT + 11;
+    int NS__ID = COPYRIGHTED_FEATURE_COUNT + 13;
 
     /**
      * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
@@ -2532,89 +2596,89 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS__PUBLICATION_STAGE = TCOPYRIGHTED_FEATURE_COUNT + 12;
+    int NS__PUBLICATION_STAGE = COPYRIGHTED_FEATURE_COUNT + 14;
 
     /**
-     * The feature id for the '<em><b>Release</b></em>' attribute.
+     * The feature id for the '<em><b>Revision</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNS__RELEASE = TCOPYRIGHTED_FEATURE_COUNT + 13;
+    int NS__REVISION = COPYRIGHTED_FEATURE_COUNT + 15;
 
     /**
-     * The feature id for the '<em><b>Revision</b></em>' attribute.
+     * The feature id for the '<em><b>Uml Date</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNS__REVISION = TCOPYRIGHTED_FEATURE_COUNT + 14;
+    int NS__UML_DATE = COPYRIGHTED_FEATURE_COUNT + 16;
 
     /**
-     * The feature id for the '<em><b>Uml Date</b></em>' attribute.
+     * The feature id for the '<em><b>Uml Version</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNS__UML_DATE = TCOPYRIGHTED_FEATURE_COUNT + 15;
+    int NS__UML_VERSION = COPYRIGHTED_FEATURE_COUNT + 17;
 
     /**
-     * The feature id for the '<em><b>Uml Version</b></em>' attribute.
+     * The number of structural features of the '<em>NS</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNS__UML_VERSION = TCOPYRIGHTED_FEATURE_COUNT + 16;
+    int NS_FEATURE_COUNT = COPYRIGHTED_FEATURE_COUNT + 18;
 
     /**
-     * The feature id for the '<em><b>Version</b></em>' attribute.
+     * The number of operations of the '<em>NS</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNS__VERSION = TCOPYRIGHTED_FEATURE_COUNT + 17;
+    int NS_OPERATION_COUNT = COPYRIGHTED_OPERATION_COUNT + 0;
 
     /**
-     * The number of structural features of the '<em>TNS</em>' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl <em>NS Doc</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getNSDoc()
      * @generated
-     * @ordered
      */
-    int TNS_FEATURE_COUNT = TCOPYRIGHTED_FEATURE_COUNT + 18;
+    int NS_DOC = 34;
 
     /**
-     * The number of operations of the '<em>TNS</em>' class.
+     * The feature id for the '<em><b>Copyright</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNS_OPERATION_COUNT = TCOPYRIGHTED_OPERATION_COUNT + 0;
+    int NS_DOC__COPYRIGHT = COPYRIGHTED__COPYRIGHT;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl <em>TNS Doc</em>}' class.
+     * The feature id for the '<em><b>Release</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSDoc()
      * @generated
+     * @ordered
      */
-    int TNS_DOC = 34;
+    int NS_DOC__RELEASE = COPYRIGHTED_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Copyright</b></em>' containment reference.
+     * The feature id for the '<em><b>Version</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNS_DOC__COPYRIGHT = TCOPYRIGHTED__COPYRIGHT;
+    int NS_DOC__VERSION = COPYRIGHTED_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Doc</b></em>' containment reference list.
@@ -2623,7 +2687,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS_DOC__DOC = TCOPYRIGHTED_FEATURE_COUNT + 0;
+    int NS_DOC__DOC = COPYRIGHTED_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -2632,7 +2696,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS_DOC__ID = TCOPYRIGHTED_FEATURE_COUNT + 1;
+    int NS_DOC__ID = COPYRIGHTED_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Lang</b></em>' attribute.
@@ -2641,7 +2705,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS_DOC__LANG = TCOPYRIGHTED_FEATURE_COUNT + 2;
+    int NS_DOC__LANG = COPYRIGHTED_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
@@ -2650,16 +2714,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS_DOC__PUBLICATION_STAGE = TCOPYRIGHTED_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Release</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int TNS_DOC__RELEASE = TCOPYRIGHTED_FEATURE_COUNT + 4;
+    int NS_DOC__PUBLICATION_STAGE = COPYRIGHTED_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Revision</b></em>' attribute.
@@ -2668,7 +2723,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS_DOC__REVISION = TCOPYRIGHTED_FEATURE_COUNT + 5;
+    int NS_DOC__REVISION = COPYRIGHTED_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Uml Date</b></em>' attribute.
@@ -2677,7 +2732,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS_DOC__UML_DATE = TCOPYRIGHTED_FEATURE_COUNT + 6;
+    int NS_DOC__UML_DATE = COPYRIGHTED_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Uml Version</b></em>' attribute.
@@ -2686,44 +2741,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TNS_DOC__UML_VERSION = TCOPYRIGHTED_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int TNS_DOC__VERSION = TCOPYRIGHTED_FEATURE_COUNT + 8;
+    int NS_DOC__UML_VERSION = COPYRIGHTED_FEATURE_COUNT + 8;
 
     /**
-     * The number of structural features of the '<em>TNS Doc</em>' class.
+     * The number of structural features of the '<em>NS Doc</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNS_DOC_FEATURE_COUNT = TCOPYRIGHTED_FEATURE_COUNT + 9;
+    int NS_DOC_FEATURE_COUNT = COPYRIGHTED_FEATURE_COUNT + 9;
 
     /**
-     * The number of operations of the '<em>TNS Doc</em>' class.
+     * The number of operations of the '<em>NS Doc</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TNS_DOC_OPERATION_COUNT = TCOPYRIGHTED_OPERATION_COUNT + 0;
+    int NS_DOC_OPERATION_COUNT = COPYRIGHTED_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionImpl <em>TPresence Condition</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionImpl <em>Presence Condition</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPresenceCondition()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getPresenceCondition()
      * @generated
      */
-    int TPRESENCE_CONDITION = 35;
+    int PRESENCE_CONDITION = 35;
 
     /**
      * The feature id for the '<em><b>Argument</b></em>' attribute.
@@ -2732,7 +2778,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TPRESENCE_CONDITION__ARGUMENT = 0;
+    int PRESENCE_CONDITION__ARGUMENT = 0;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -2741,7 +2787,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TPRESENCE_CONDITION__DESC_ID = 1;
+    int PRESENCE_CONDITION__DESC_ID = 1;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -2750,7 +2796,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TPRESENCE_CONDITION__NAME = 2;
+    int PRESENCE_CONDITION__NAME = 2;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -2759,35 +2805,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TPRESENCE_CONDITION__TITLE_ID = 3;
+    int PRESENCE_CONDITION__TITLE_ID = 3;
 
     /**
-     * The number of structural features of the '<em>TPresence Condition</em>' class.
+     * The number of structural features of the '<em>Presence Condition</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TPRESENCE_CONDITION_FEATURE_COUNT = 4;
+    int PRESENCE_CONDITION_FEATURE_COUNT = 4;
 
     /**
-     * The number of operations of the '<em>TPresence Condition</em>' class.
+     * The number of operations of the '<em>Presence Condition</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TPRESENCE_CONDITION_OPERATION_COUNT = 0;
+    int PRESENCE_CONDITION_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionsImpl <em>TPresence Conditions</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionsImpl <em>Presence Conditions</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionsImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPresenceConditions()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionsImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getPresenceConditions()
      * @generated
      */
-    int TPRESENCE_CONDITIONS = 36;
+    int PRESENCE_CONDITIONS = 36;
 
     /**
      * The feature id for the '<em><b>Presence Condition</b></em>' containment reference list.
@@ -2796,35 +2842,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TPRESENCE_CONDITIONS__PRESENCE_CONDITION = 0;
+    int PRESENCE_CONDITIONS__PRESENCE_CONDITION = 0;
 
     /**
-     * The number of structural features of the '<em>TPresence Conditions</em>' class.
+     * The number of structural features of the '<em>Presence Conditions</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TPRESENCE_CONDITIONS_FEATURE_COUNT = 1;
+    int PRESENCE_CONDITIONS_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TPresence Conditions</em>' class.
+     * The number of operations of the '<em>Presence Conditions</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TPRESENCE_CONDITIONS_OPERATION_COUNT = 0;
+    int PRESENCE_CONDITIONS_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCImpl <em>TService CDC</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCImpl <em>Service CDC</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceCDC()
      * @generated
      */
-    int TSERVICE_CDC = 37;
+    int SERVICE_CDC = 37;
 
     /**
      * The feature id for the '<em><b>Service Data Attribute</b></em>' containment reference list.
@@ -2833,7 +2879,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE = 0;
+    int SERVICE_CDC__SERVICE_DATA_ATTRIBUTE = 0;
 
     /**
      * The feature id for the '<em><b>Cdc</b></em>' attribute.
@@ -2842,7 +2888,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CDC__CDC = 1;
+    int SERVICE_CDC__CDC = 1;
 
     /**
      * The feature id for the '<em><b>Variant</b></em>' attribute.
@@ -2851,35 +2897,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CDC__VARIANT = 2;
+    int SERVICE_CDC__VARIANT = 2;
 
     /**
-     * The number of structural features of the '<em>TService CDC</em>' class.
+     * The number of structural features of the '<em>Service CDC</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_CDC_FEATURE_COUNT = 3;
+    int SERVICE_CDC_FEATURE_COUNT = 3;
 
     /**
-     * The number of operations of the '<em>TService CDC</em>' class.
+     * The number of operations of the '<em>Service CDC</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_CDC_OPERATION_COUNT = 0;
+    int SERVICE_CDC_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCsImpl <em>TService CD Cs</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCsImpl <em>Service CD Cs</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCsImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceCDCs()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCsImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceCDCs()
      * @generated
      */
-    int TSERVICE_CD_CS = 38;
+    int SERVICE_CD_CS = 38;
 
     /**
      * The feature id for the '<em><b>Service CDC</b></em>' containment reference list.
@@ -2888,35 +2934,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CD_CS__SERVICE_CDC = 0;
+    int SERVICE_CD_CS__SERVICE_CDC = 0;
 
     /**
-     * The number of structural features of the '<em>TService CD Cs</em>' class.
+     * The number of structural features of the '<em>Service CD Cs</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_CD_CS_FEATURE_COUNT = 1;
+    int SERVICE_CD_CS_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TService CD Cs</em>' class.
+     * The number of operations of the '<em>Service CD Cs</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_CD_CS_OPERATION_COUNT = 0;
+    int SERVICE_CD_CS_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributeImpl <em>TService Constructed Attribute</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributeImpl <em>Service Constructed Attribute</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributeImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceConstructedAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributeImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceConstructedAttribute()
      * @generated
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE = 39;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE = 39;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -2925,7 +2971,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE__DEPRECATED = TCONSTRUCTED_ATTRIBUTE__DEPRECATED;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE__DEPRECATED = CONSTRUCTED_ATTRIBUTE__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -2934,7 +2980,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE__DESC_ID = TCONSTRUCTED_ATTRIBUTE__DESC_ID;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE__DESC_ID = CONSTRUCTED_ATTRIBUTE__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -2943,7 +2989,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE__INFORMATIVE = TCONSTRUCTED_ATTRIBUTE__INFORMATIVE;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE__INFORMATIVE = CONSTRUCTED_ATTRIBUTE__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Title ID</b></em>' attribute.
@@ -2952,7 +2998,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE__TITLE_ID = TCONSTRUCTED_ATTRIBUTE__TITLE_ID;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE__TITLE_ID = CONSTRUCTED_ATTRIBUTE__TITLE_ID;
 
     /**
      * The feature id for the '<em><b>Sub Data Attribute</b></em>' containment reference list.
@@ -2961,7 +3007,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE = TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE = CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -2970,7 +3016,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE__NAME = TCONSTRUCTED_ATTRIBUTE__NAME;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE__NAME = CONSTRUCTED_ATTRIBUTE__NAME;
 
     /**
      * The feature id for the '<em><b>Type Kind Parameterized</b></em>' attribute.
@@ -2979,35 +3025,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED = TCONSTRUCTED_ATTRIBUTE_FEATURE_COUNT + 0;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED = CONSTRUCTED_ATTRIBUTE_FEATURE_COUNT + 0;
 
     /**
-     * The number of structural features of the '<em>TService Constructed Attribute</em>' class.
+     * The number of structural features of the '<em>Service Constructed Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE_FEATURE_COUNT = TCONSTRUCTED_ATTRIBUTE_FEATURE_COUNT + 1;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE_FEATURE_COUNT = CONSTRUCTED_ATTRIBUTE_FEATURE_COUNT + 1;
 
     /**
-     * The number of operations of the '<em>TService Constructed Attribute</em>' class.
+     * The number of operations of the '<em>Service Constructed Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTE_OPERATION_COUNT = TCONSTRUCTED_ATTRIBUTE_OPERATION_COUNT + 0;
+    int SERVICE_CONSTRUCTED_ATTRIBUTE_OPERATION_COUNT = CONSTRUCTED_ATTRIBUTE_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributesImpl <em>TService Constructed Attributes</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributesImpl <em>Service Constructed Attributes</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributesImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceConstructedAttributes()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributesImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceConstructedAttributes()
      * @generated
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTES = 40;
+    int SERVICE_CONSTRUCTED_ATTRIBUTES = 40;
 
     /**
      * The feature id for the '<em><b>Service Constructed Attribute</b></em>' containment reference list.
@@ -3016,35 +3062,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE = 0;
+    int SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE = 0;
 
     /**
-     * The number of structural features of the '<em>TService Constructed Attributes</em>' class.
+     * The number of structural features of the '<em>Service Constructed Attributes</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTES_FEATURE_COUNT = 1;
+    int SERVICE_CONSTRUCTED_ATTRIBUTES_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TService Constructed Attributes</em>' class.
+     * The number of operations of the '<em>Service Constructed Attributes</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_CONSTRUCTED_ATTRIBUTES_OPERATION_COUNT = 0;
+    int SERVICE_CONSTRUCTED_ATTRIBUTES_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl <em>TService Data Attribute</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl <em>Service Data Attribute</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceDataAttribute()
      * @generated
      */
-    int TSERVICE_DATA_ATTRIBUTE = 41;
+    int SERVICE_DATA_ATTRIBUTE = 41;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -3053,7 +3099,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__DEPRECATED = TDOCUMENTED_CLASS__DEPRECATED;
+    int SERVICE_DATA_ATTRIBUTE__DEPRECATED = DOCUMENTED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -3062,7 +3108,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__DESC_ID = TDOCUMENTED_CLASS__DESC_ID;
+    int SERVICE_DATA_ATTRIBUTE__DESC_ID = DOCUMENTED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -3071,7 +3117,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__INFORMATIVE = TDOCUMENTED_CLASS__INFORMATIVE;
+    int SERVICE_DATA_ATTRIBUTE__INFORMATIVE = DOCUMENTED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Fc</b></em>' attribute.
@@ -3080,7 +3126,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__FC = TDOCUMENTED_CLASS_FEATURE_COUNT + 0;
+    int SERVICE_DATA_ATTRIBUTE__FC = DOCUMENTED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -3089,7 +3135,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__NAME = TDOCUMENTED_CLASS_FEATURE_COUNT + 1;
+    int SERVICE_DATA_ATTRIBUTE__NAME = DOCUMENTED_CLASS_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Pres Cond</b></em>' attribute.
@@ -3098,7 +3144,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__PRES_COND = TDOCUMENTED_CLASS_FEATURE_COUNT + 2;
+    int SERVICE_DATA_ATTRIBUTE__PRES_COND = DOCUMENTED_CLASS_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args</b></em>' attribute.
@@ -3107,7 +3153,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS = TDOCUMENTED_CLASS_FEATURE_COUNT + 3;
+    int SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS = DOCUMENTED_CLASS_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args ID</b></em>' attribute.
@@ -3116,7 +3162,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID = TDOCUMENTED_CLASS_FEATURE_COUNT + 4;
+    int SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID = DOCUMENTED_CLASS_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Type</b></em>' attribute.
@@ -3125,7 +3171,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__TYPE = TDOCUMENTED_CLASS_FEATURE_COUNT + 5;
+    int SERVICE_DATA_ATTRIBUTE__TYPE = DOCUMENTED_CLASS_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Type Kind</b></em>' attribute.
@@ -3134,7 +3180,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__TYPE_KIND = TDOCUMENTED_CLASS_FEATURE_COUNT + 6;
+    int SERVICE_DATA_ATTRIBUTE__TYPE_KIND = DOCUMENTED_CLASS_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Underlying Type</b></em>' attribute.
@@ -3143,7 +3189,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE = TDOCUMENTED_CLASS_FEATURE_COUNT + 7;
+    int SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE = DOCUMENTED_CLASS_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Underlying Type Kind</b></em>' attribute.
@@ -3152,35 +3198,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND = TDOCUMENTED_CLASS_FEATURE_COUNT + 8;
+    int SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND = DOCUMENTED_CLASS_FEATURE_COUNT + 8;
 
     /**
-     * The number of structural features of the '<em>TService Data Attribute</em>' class.
+     * The number of structural features of the '<em>Service Data Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE_FEATURE_COUNT = TDOCUMENTED_CLASS_FEATURE_COUNT + 9;
+    int SERVICE_DATA_ATTRIBUTE_FEATURE_COUNT = DOCUMENTED_CLASS_FEATURE_COUNT + 9;
 
     /**
-     * The number of operations of the '<em>TService Data Attribute</em>' class.
+     * The number of operations of the '<em>Service Data Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_DATA_ATTRIBUTE_OPERATION_COUNT = TDOCUMENTED_CLASS_OPERATION_COUNT + 0;
+    int SERVICE_DATA_ATTRIBUTE_OPERATION_COUNT = DOCUMENTED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl <em>TService NS</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl <em>Service NS</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceNS()
      * @generated
      */
-    int TSERVICE_NS = 42;
+    int SERVICE_NS = 42;
 
     /**
      * The feature id for the '<em><b>Copyright</b></em>' containment reference.
@@ -3189,252 +3235,252 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__COPYRIGHT = TCOPYRIGHTED__COPYRIGHT;
+    int SERVICE_NS__COPYRIGHT = COPYRIGHTED__COPYRIGHT;
 
     /**
-     * The feature id for the '<em><b>Changes</b></em>' containment reference.
+     * The feature id for the '<em><b>Release</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__CHANGES = TCOPYRIGHTED_FEATURE_COUNT + 0;
+    int SERVICE_NS__RELEASE = COPYRIGHTED_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Functional Constraints</b></em>' containment reference.
+     * The feature id for the '<em><b>Version</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__FUNCTIONAL_CONSTRAINTS = TCOPYRIGHTED_FEATURE_COUNT + 1;
+    int SERVICE_NS__VERSION = COPYRIGHTED_FEATURE_COUNT + 1;
 
     /**
-     * The feature id for the '<em><b>Presence Conditions</b></em>' containment reference.
+     * The feature id for the '<em><b>Changes</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__PRESENCE_CONDITIONS = TCOPYRIGHTED_FEATURE_COUNT + 2;
+    int SERVICE_NS__CHANGES = COPYRIGHTED_FEATURE_COUNT + 2;
 
     /**
-     * The feature id for the '<em><b>Abbreviations</b></em>' containment reference.
+     * The feature id for the '<em><b>Functional Constraints</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__ABBREVIATIONS = TCOPYRIGHTED_FEATURE_COUNT + 3;
+    int SERVICE_NS__FUNCTIONAL_CONSTRAINTS = COPYRIGHTED_FEATURE_COUNT + 3;
 
     /**
-     * The feature id for the '<em><b>Service Type Realizations</b></em>' containment reference.
+     * The feature id for the '<em><b>Presence Conditions</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__SERVICE_TYPE_REALIZATIONS = TCOPYRIGHTED_FEATURE_COUNT + 4;
+    int SERVICE_NS__PRESENCE_CONDITIONS = COPYRIGHTED_FEATURE_COUNT + 4;
 
     /**
-     * The feature id for the '<em><b>Service Constructed Attributes</b></em>' containment reference.
+     * The feature id for the '<em><b>Abbreviations</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES = TCOPYRIGHTED_FEATURE_COUNT + 5;
+    int SERVICE_NS__ABBREVIATIONS = COPYRIGHTED_FEATURE_COUNT + 5;
 
     /**
-     * The feature id for the '<em><b>Service CD Cs</b></em>' containment reference.
+     * The feature id for the '<em><b>Service Type Realizations</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__SERVICE_CD_CS = TCOPYRIGHTED_FEATURE_COUNT + 6;
+    int SERVICE_NS__SERVICE_TYPE_REALIZATIONS = COPYRIGHTED_FEATURE_COUNT + 6;
 
     /**
-     * The feature id for the '<em><b>Desc ID</b></em>' attribute.
+     * The feature id for the '<em><b>Service Constructed Attributes</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__DESC_ID = TCOPYRIGHTED_FEATURE_COUNT + 7;
+    int SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES = COPYRIGHTED_FEATURE_COUNT + 7;
 
     /**
-     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * The feature id for the '<em><b>Service CD Cs</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__ID = TCOPYRIGHTED_FEATURE_COUNT + 8;
+    int SERVICE_NS__SERVICE_CD_CS = COPYRIGHTED_FEATURE_COUNT + 8;
 
     /**
-     * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
+     * The feature id for the '<em><b>Desc ID</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__PUBLICATION_STAGE = TCOPYRIGHTED_FEATURE_COUNT + 9;
+    int SERVICE_NS__DESC_ID = COPYRIGHTED_FEATURE_COUNT + 9;
 
     /**
-     * The feature id for the '<em><b>Release</b></em>' attribute.
+     * The feature id for the '<em><b>Id</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__RELEASE = TCOPYRIGHTED_FEATURE_COUNT + 10;
+    int SERVICE_NS__ID = COPYRIGHTED_FEATURE_COUNT + 10;
 
     /**
-     * The feature id for the '<em><b>Revision</b></em>' attribute.
+     * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__REVISION = TCOPYRIGHTED_FEATURE_COUNT + 11;
+    int SERVICE_NS__PUBLICATION_STAGE = COPYRIGHTED_FEATURE_COUNT + 11;
 
     /**
-     * The feature id for the '<em><b>Uml Date</b></em>' attribute.
+     * The feature id for the '<em><b>Revision</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__UML_DATE = TCOPYRIGHTED_FEATURE_COUNT + 12;
+    int SERVICE_NS__REVISION = COPYRIGHTED_FEATURE_COUNT + 12;
 
     /**
-     * The feature id for the '<em><b>Uml Version</b></em>' attribute.
+     * The feature id for the '<em><b>Uml Date</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__UML_VERSION = TCOPYRIGHTED_FEATURE_COUNT + 13;
+    int SERVICE_NS__UML_DATE = COPYRIGHTED_FEATURE_COUNT + 13;
 
     /**
-     * The feature id for the '<em><b>Version</b></em>' attribute.
+     * The feature id for the '<em><b>Uml Version</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS__VERSION = TCOPYRIGHTED_FEATURE_COUNT + 14;
+    int SERVICE_NS__UML_VERSION = COPYRIGHTED_FEATURE_COUNT + 14;
 
     /**
-     * The number of structural features of the '<em>TService NS</em>' class.
+     * The number of structural features of the '<em>Service NS</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_FEATURE_COUNT = TCOPYRIGHTED_FEATURE_COUNT + 15;
+    int SERVICE_NS_FEATURE_COUNT = COPYRIGHTED_FEATURE_COUNT + 15;
 
     /**
-     * The number of operations of the '<em>TService NS</em>' class.
+     * The number of operations of the '<em>Service NS</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_OPERATION_COUNT = TCOPYRIGHTED_OPERATION_COUNT + 0;
+    int SERVICE_NS_OPERATION_COUNT = COPYRIGHTED_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl <em>TService Ns Usage</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNsUsageImpl <em>Service Ns Usage</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceNsUsage()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNsUsageImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceNsUsage()
      * @generated
      */
-    int TSERVICE_NS_USAGE = 43;
+    int SERVICE_NS_USAGE = 43;
 
     /**
-     * The feature id for the '<em><b>Applies To</b></em>' containment reference list.
+     * The feature id for the '<em><b>Release</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_USAGE__APPLIES_TO = 0;
+    int SERVICE_NS_USAGE__RELEASE = NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE;
 
     /**
-     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * The feature id for the '<em><b>Version</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_USAGE__ID = 1;
+    int SERVICE_NS_USAGE__VERSION = NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION;
 
     /**
-     * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
+     * The feature id for the '<em><b>Applies To</b></em>' containment reference list.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_USAGE__PUBLICATION_STAGE = 2;
+    int SERVICE_NS_USAGE__APPLIES_TO = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Release</b></em>' attribute.
+     * The feature id for the '<em><b>Id</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_USAGE__RELEASE = 3;
+    int SERVICE_NS_USAGE__ID = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 1;
 
     /**
-     * The feature id for the '<em><b>Revision</b></em>' attribute.
+     * The feature id for the '<em><b>Publication Stage</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_USAGE__REVISION = 4;
+    int SERVICE_NS_USAGE__PUBLICATION_STAGE = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 2;
 
     /**
-     * The feature id for the '<em><b>Version</b></em>' attribute.
+     * The feature id for the '<em><b>Revision</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_USAGE__VERSION = 5;
+    int SERVICE_NS_USAGE__REVISION = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 3;
 
     /**
-     * The number of structural features of the '<em>TService Ns Usage</em>' class.
+     * The number of structural features of the '<em>Service Ns Usage</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_USAGE_FEATURE_COUNT = 6;
+    int SERVICE_NS_USAGE_FEATURE_COUNT = NSD_OBJECT_WITH_VERSION_AND_RELEASE_FEATURE_COUNT + 4;
 
     /**
-     * The number of operations of the '<em>TService Ns Usage</em>' class.
+     * The number of operations of the '<em>Service Ns Usage</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_NS_USAGE_OPERATION_COUNT = 0;
+    int SERVICE_NS_USAGE_OPERATION_COUNT = NSD_OBJECT_WITH_VERSION_AND_RELEASE_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl <em>TService Parameter</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl <em>Service Parameter</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceParameter()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceParameter()
      * @generated
      */
-    int TSERVICE_PARAMETER = 44;
+    int SERVICE_PARAMETER = 44;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -3443,7 +3489,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER__DEPRECATED = TDOCUMENTED_CLASS__DEPRECATED;
+    int SERVICE_PARAMETER__DEPRECATED = DOCUMENTED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -3452,7 +3498,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER__DESC_ID = TDOCUMENTED_CLASS__DESC_ID;
+    int SERVICE_PARAMETER__DESC_ID = DOCUMENTED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -3461,7 +3507,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER__INFORMATIVE = TDOCUMENTED_CLASS__INFORMATIVE;
+    int SERVICE_PARAMETER__INFORMATIVE = DOCUMENTED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Default Value</b></em>' attribute.
@@ -3470,7 +3516,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER__DEFAULT_VALUE = TDOCUMENTED_CLASS_FEATURE_COUNT + 0;
+    int SERVICE_PARAMETER__DEFAULT_VALUE = DOCUMENTED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Max Value</b></em>' attribute.
@@ -3479,7 +3525,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER__MAX_VALUE = TDOCUMENTED_CLASS_FEATURE_COUNT + 1;
+    int SERVICE_PARAMETER__MAX_VALUE = DOCUMENTED_CLASS_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Min Value</b></em>' attribute.
@@ -3488,7 +3534,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER__MIN_VALUE = TDOCUMENTED_CLASS_FEATURE_COUNT + 2;
+    int SERVICE_PARAMETER__MIN_VALUE = DOCUMENTED_CLASS_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -3497,7 +3543,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER__NAME = TDOCUMENTED_CLASS_FEATURE_COUNT + 3;
+    int SERVICE_PARAMETER__NAME = DOCUMENTED_CLASS_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Type</b></em>' attribute.
@@ -3506,7 +3552,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER__TYPE = TDOCUMENTED_CLASS_FEATURE_COUNT + 4;
+    int SERVICE_PARAMETER__TYPE = DOCUMENTED_CLASS_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Type Kind</b></em>' attribute.
@@ -3515,35 +3561,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER__TYPE_KIND = TDOCUMENTED_CLASS_FEATURE_COUNT + 5;
+    int SERVICE_PARAMETER__TYPE_KIND = DOCUMENTED_CLASS_FEATURE_COUNT + 5;
 
     /**
-     * The number of structural features of the '<em>TService Parameter</em>' class.
+     * The number of structural features of the '<em>Service Parameter</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER_FEATURE_COUNT = TDOCUMENTED_CLASS_FEATURE_COUNT + 6;
+    int SERVICE_PARAMETER_FEATURE_COUNT = DOCUMENTED_CLASS_FEATURE_COUNT + 6;
 
     /**
-     * The number of operations of the '<em>TService Parameter</em>' class.
+     * The number of operations of the '<em>Service Parameter</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_PARAMETER_OPERATION_COUNT = TDOCUMENTED_CLASS_OPERATION_COUNT + 0;
+    int SERVICE_PARAMETER_OPERATION_COUNT = DOCUMENTED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl <em>TService Type Realization</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl <em>Service Type Realization</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceTypeRealization()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceTypeRealization()
      * @generated
      */
-    int TSERVICE_TYPE_REALIZATION = 45;
+    int SERVICE_TYPE_REALIZATION = 45;
 
     /**
      * The feature id for the '<em><b>Fc</b></em>' attribute.
@@ -3552,7 +3598,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATION__FC = 0;
+    int SERVICE_TYPE_REALIZATION__FC = 0;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -3561,7 +3607,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATION__NAME = 1;
+    int SERVICE_TYPE_REALIZATION__NAME = 1;
 
     /**
      * The feature id for the '<em><b>Pres Cond</b></em>' attribute.
@@ -3570,7 +3616,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATION__PRES_COND = 2;
+    int SERVICE_TYPE_REALIZATION__PRES_COND = 2;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args</b></em>' attribute.
@@ -3579,7 +3625,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS = 3;
+    int SERVICE_TYPE_REALIZATION__PRES_COND_ARGS = 3;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args ID</b></em>' attribute.
@@ -3588,7 +3634,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID = 4;
+    int SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID = 4;
 
     /**
      * The feature id for the '<em><b>Type</b></em>' attribute.
@@ -3597,7 +3643,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATION__TYPE = 5;
+    int SERVICE_TYPE_REALIZATION__TYPE = 5;
 
     /**
      * The feature id for the '<em><b>Type Kind</b></em>' attribute.
@@ -3606,35 +3652,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATION__TYPE_KIND = 6;
+    int SERVICE_TYPE_REALIZATION__TYPE_KIND = 6;
 
     /**
-     * The number of structural features of the '<em>TService Type Realization</em>' class.
+     * The number of structural features of the '<em>Service Type Realization</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATION_FEATURE_COUNT = 7;
+    int SERVICE_TYPE_REALIZATION_FEATURE_COUNT = 7;
 
     /**
-     * The number of operations of the '<em>TService Type Realization</em>' class.
+     * The number of operations of the '<em>Service Type Realization</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATION_OPERATION_COUNT = 0;
+    int SERVICE_TYPE_REALIZATION_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationsImpl <em>TService Type Realizations</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationsImpl <em>Service Type Realizations</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationsImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceTypeRealizations()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationsImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceTypeRealizations()
      * @generated
      */
-    int TSERVICE_TYPE_REALIZATIONS = 46;
+    int SERVICE_TYPE_REALIZATIONS = 46;
 
     /**
      * The feature id for the '<em><b>Service Type Realization</b></em>' containment reference list.
@@ -3643,35 +3689,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION = 0;
+    int SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION = 0;
 
     /**
-     * The number of structural features of the '<em>TService Type Realizations</em>' class.
+     * The number of structural features of the '<em>Service Type Realizations</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATIONS_FEATURE_COUNT = 1;
+    int SERVICE_TYPE_REALIZATIONS_FEATURE_COUNT = 1;
 
     /**
-     * The number of operations of the '<em>TService Type Realizations</em>' class.
+     * The number of operations of the '<em>Service Type Realizations</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSERVICE_TYPE_REALIZATIONS_OPERATION_COUNT = 0;
+    int SERVICE_TYPE_REALIZATIONS_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl <em>TSub Data Attribute</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl <em>Sub Data Attribute</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getSubDataAttribute()
      * @generated
      */
-    int TSUB_DATA_ATTRIBUTE = 47;
+    int SUB_DATA_ATTRIBUTE = 47;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -3680,7 +3726,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__DEPRECATED = TDOCUMENTED_CLASS__DEPRECATED;
+    int SUB_DATA_ATTRIBUTE__DEPRECATED = DOCUMENTED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -3689,7 +3735,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__DESC_ID = TDOCUMENTED_CLASS__DESC_ID;
+    int SUB_DATA_ATTRIBUTE__DESC_ID = DOCUMENTED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -3698,7 +3744,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__INFORMATIVE = TDOCUMENTED_CLASS__INFORMATIVE;
+    int SUB_DATA_ATTRIBUTE__INFORMATIVE = DOCUMENTED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Default Value</b></em>' attribute.
@@ -3707,7 +3753,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE = TDOCUMENTED_CLASS_FEATURE_COUNT + 0;
+    int SUB_DATA_ATTRIBUTE__DEFAULT_VALUE = DOCUMENTED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Is Array</b></em>' attribute.
@@ -3716,7 +3762,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__IS_ARRAY = TDOCUMENTED_CLASS_FEATURE_COUNT + 1;
+    int SUB_DATA_ATTRIBUTE__IS_ARRAY = DOCUMENTED_CLASS_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Max Index Attribute</b></em>' attribute.
@@ -3725,7 +3771,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE = TDOCUMENTED_CLASS_FEATURE_COUNT + 2;
+    int SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE = DOCUMENTED_CLASS_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Max Value</b></em>' attribute.
@@ -3734,7 +3780,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__MAX_VALUE = TDOCUMENTED_CLASS_FEATURE_COUNT + 3;
+    int SUB_DATA_ATTRIBUTE__MAX_VALUE = DOCUMENTED_CLASS_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Min Index</b></em>' attribute.
@@ -3743,7 +3789,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__MIN_INDEX = TDOCUMENTED_CLASS_FEATURE_COUNT + 4;
+    int SUB_DATA_ATTRIBUTE__MIN_INDEX = DOCUMENTED_CLASS_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Min Value</b></em>' attribute.
@@ -3752,7 +3798,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__MIN_VALUE = TDOCUMENTED_CLASS_FEATURE_COUNT + 5;
+    int SUB_DATA_ATTRIBUTE__MIN_VALUE = DOCUMENTED_CLASS_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -3761,7 +3807,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__NAME = TDOCUMENTED_CLASS_FEATURE_COUNT + 6;
+    int SUB_DATA_ATTRIBUTE__NAME = DOCUMENTED_CLASS_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Pres Cond</b></em>' attribute.
@@ -3770,7 +3816,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__PRES_COND = TDOCUMENTED_CLASS_FEATURE_COUNT + 7;
+    int SUB_DATA_ATTRIBUTE__PRES_COND = DOCUMENTED_CLASS_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args</b></em>' attribute.
@@ -3779,7 +3825,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS = TDOCUMENTED_CLASS_FEATURE_COUNT + 8;
+    int SUB_DATA_ATTRIBUTE__PRES_COND_ARGS = DOCUMENTED_CLASS_FEATURE_COUNT + 8;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args ID</b></em>' attribute.
@@ -3788,7 +3834,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID = TDOCUMENTED_CLASS_FEATURE_COUNT + 9;
+    int SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID = DOCUMENTED_CLASS_FEATURE_COUNT + 9;
 
     /**
      * The feature id for the '<em><b>Size Attribute</b></em>' attribute.
@@ -3797,7 +3843,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE = TDOCUMENTED_CLASS_FEATURE_COUNT + 10;
+    int SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE = DOCUMENTED_CLASS_FEATURE_COUNT + 10;
 
     /**
      * The feature id for the '<em><b>Type</b></em>' attribute.
@@ -3806,7 +3852,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__TYPE = TDOCUMENTED_CLASS_FEATURE_COUNT + 11;
+    int SUB_DATA_ATTRIBUTE__TYPE = DOCUMENTED_CLASS_FEATURE_COUNT + 11;
 
     /**
      * The feature id for the '<em><b>Type Kind</b></em>' attribute.
@@ -3815,35 +3861,35 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE__TYPE_KIND = TDOCUMENTED_CLASS_FEATURE_COUNT + 12;
+    int SUB_DATA_ATTRIBUTE__TYPE_KIND = DOCUMENTED_CLASS_FEATURE_COUNT + 12;
 
     /**
-     * The number of structural features of the '<em>TSub Data Attribute</em>' class.
+     * The number of structural features of the '<em>Sub Data Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE_FEATURE_COUNT = TDOCUMENTED_CLASS_FEATURE_COUNT + 13;
+    int SUB_DATA_ATTRIBUTE_FEATURE_COUNT = DOCUMENTED_CLASS_FEATURE_COUNT + 13;
 
     /**
-     * The number of operations of the '<em>TSub Data Attribute</em>' class.
+     * The number of operations of the '<em>Sub Data Attribute</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSUB_DATA_ATTRIBUTE_OPERATION_COUNT = TDOCUMENTED_CLASS_OPERATION_COUNT + 0;
+    int SUB_DATA_ATTRIBUTE_OPERATION_COUNT = DOCUMENTED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl <em>TSub Data Object</em>}' class.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl <em>Sub Data Object</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getSubDataObject()
      * @generated
      */
-    int TSUB_DATA_OBJECT = 48;
+    int SUB_DATA_OBJECT = 48;
 
     /**
      * The feature id for the '<em><b>Deprecated</b></em>' attribute.
@@ -3852,7 +3898,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__DEPRECATED = TDOCUMENTED_CLASS__DEPRECATED;
+    int SUB_DATA_OBJECT__DEPRECATED = DOCUMENTED_CLASS__DEPRECATED;
 
     /**
      * The feature id for the '<em><b>Desc ID</b></em>' attribute.
@@ -3861,7 +3907,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__DESC_ID = TDOCUMENTED_CLASS__DESC_ID;
+    int SUB_DATA_OBJECT__DESC_ID = DOCUMENTED_CLASS__DESC_ID;
 
     /**
      * The feature id for the '<em><b>Informative</b></em>' attribute.
@@ -3870,7 +3916,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__INFORMATIVE = TDOCUMENTED_CLASS__INFORMATIVE;
+    int SUB_DATA_OBJECT__INFORMATIVE = DOCUMENTED_CLASS__INFORMATIVE;
 
     /**
      * The feature id for the '<em><b>Is Array</b></em>' attribute.
@@ -3879,7 +3925,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__IS_ARRAY = TDOCUMENTED_CLASS_FEATURE_COUNT + 0;
+    int SUB_DATA_OBJECT__IS_ARRAY = DOCUMENTED_CLASS_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Max Index Attribute</b></em>' attribute.
@@ -3888,7 +3934,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE = TDOCUMENTED_CLASS_FEATURE_COUNT + 1;
+    int SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE = DOCUMENTED_CLASS_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Min Index</b></em>' attribute.
@@ -3897,7 +3943,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__MIN_INDEX = TDOCUMENTED_CLASS_FEATURE_COUNT + 2;
+    int SUB_DATA_OBJECT__MIN_INDEX = DOCUMENTED_CLASS_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -3906,7 +3952,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__NAME = TDOCUMENTED_CLASS_FEATURE_COUNT + 3;
+    int SUB_DATA_OBJECT__NAME = DOCUMENTED_CLASS_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Pres Cond</b></em>' attribute.
@@ -3915,7 +3961,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__PRES_COND = TDOCUMENTED_CLASS_FEATURE_COUNT + 4;
+    int SUB_DATA_OBJECT__PRES_COND = DOCUMENTED_CLASS_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args</b></em>' attribute.
@@ -3924,7 +3970,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__PRES_COND_ARGS = TDOCUMENTED_CLASS_FEATURE_COUNT + 5;
+    int SUB_DATA_OBJECT__PRES_COND_ARGS = DOCUMENTED_CLASS_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Pres Cond Args ID</b></em>' attribute.
@@ -3933,7 +3979,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__PRES_COND_ARGS_ID = TDOCUMENTED_CLASS_FEATURE_COUNT + 6;
+    int SUB_DATA_OBJECT__PRES_COND_ARGS_ID = DOCUMENTED_CLASS_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Size Attribute</b></em>' attribute.
@@ -3942,7 +3988,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__SIZE_ATTRIBUTE = TDOCUMENTED_CLASS_FEATURE_COUNT + 7;
+    int SUB_DATA_OBJECT__SIZE_ATTRIBUTE = DOCUMENTED_CLASS_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Type</b></em>' attribute.
@@ -3951,7 +3997,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__TYPE = TDOCUMENTED_CLASS_FEATURE_COUNT + 8;
+    int SUB_DATA_OBJECT__TYPE = DOCUMENTED_CLASS_FEATURE_COUNT + 8;
 
     /**
      * The feature id for the '<em><b>Underlying Type</b></em>' attribute.
@@ -3960,7 +4006,7 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__UNDERLYING_TYPE = TDOCUMENTED_CLASS_FEATURE_COUNT + 9;
+    int SUB_DATA_OBJECT__UNDERLYING_TYPE = DOCUMENTED_CLASS_FEATURE_COUNT + 9;
 
     /**
      * The feature id for the '<em><b>Underlying Type Kind</b></em>' attribute.
@@ -3969,3770 +4015,3067 @@ public interface NsdPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND = TDOCUMENTED_CLASS_FEATURE_COUNT + 10;
+    int SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND = DOCUMENTED_CLASS_FEATURE_COUNT + 10;
 
     /**
-     * The number of structural features of the '<em>TSub Data Object</em>' class.
+     * The number of structural features of the '<em>Sub Data Object</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT_FEATURE_COUNT = TDOCUMENTED_CLASS_FEATURE_COUNT + 11;
+    int SUB_DATA_OBJECT_FEATURE_COUNT = DOCUMENTED_CLASS_FEATURE_COUNT + 11;
 
     /**
-     * The number of operations of the '<em>TSub Data Object</em>' class.
+     * The number of operations of the '<em>Sub Data Object</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TSUB_DATA_OBJECT_OPERATION_COUNT = TDOCUMENTED_CLASS_OPERATION_COUNT + 0;
+    int SUB_DATA_OBJECT_OPERATION_COUNT = DOCUMENTED_CLASS_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind <em>TACSI Services Kind</em>}' enum.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind <em>ACSI Services Kind</em>}' enum.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTACSIServicesKind()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getACSIServicesKind()
      * @generated
      */
-    int TACSI_SERVICES_KIND = 50;
+    int ACSI_SERVICES_KIND = 51;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind <em>TCB Kind</em>}' enum.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind <em>CB Kind</em>}' enum.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCBKind()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCBKind()
      * @generated
      */
-    int TCB_KIND = 51;
+    int CB_KIND = 52;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind <em>TDefined Attribute Type Kind</em>}' enum.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind <em>Defined Attribute Type Kind</em>}' enum.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDefinedAttributeTypeKind()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDefinedAttributeTypeKind()
      * @generated
      */
-    int TDEFINED_ATTRIBUTE_TYPE_KIND = 52;
+    int DEFINED_ATTRIBUTE_TYPE_KIND = 53;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind <em>TLicense Kind</em>}' enum.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind <em>License Kind</em>}' enum.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLicenseKind()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLicenseKind()
      * @generated
      */
-    int TLICENSE_KIND = 53;
+    int LICENSE_KIND = 54;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage <em>TPub Stage</em>}' enum.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage <em>Pub Stage</em>}' enum.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPubStage()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getPubStage()
      * @generated
      */
-    int TPUB_STAGE = 54;
+    int PUB_STAGE = 55;
 
     /**
-     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind <em>TUndefined Attribute Type Kind</em>}' enum.
+     * The meta object id for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind <em>Undefined Attribute Type Kind</em>}' enum.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTUndefinedAttributeTypeKind()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getUndefinedAttributeTypeKind()
      * @generated
      */
-    int TUNDEFINED_ATTRIBUTE_TYPE_KIND = 55;
+    int UNDEFINED_ATTRIBUTE_TYPE_KIND = 56;
 
     /**
-     * The meta object id for the '<em>TAbbreviation Name</em>' data type.
+     * The meta object id for the '<em>ACSI Services Kind Object</em>' data type.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbbreviationName()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getACSIServicesKindObject()
      * @generated
      */
-    int TABBREVIATION_NAME = 56;
+    int ACSI_SERVICES_KIND_OBJECT = 57;
 
     /**
-     * The meta object id for the '<em>TAbstract LN Class Name</em>' data type.
+     * The meta object id for the '<em>Attribute Type Kind</em>' data type.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbstractLNClassName()
+     * @see org.eclipse.emf.common.util.Enumerator
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAttributeTypeKind()
      * @generated
      */
-    int TABSTRACT_LN_CLASS_NAME = 57;
+    int ATTRIBUTE_TYPE_KIND = 58;
 
     /**
-     * The meta object id for the '<em>TACSI Services Kind Object</em>' data type.
+     * The meta object id for the '<em>CB Kind Object</em>' data type.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTACSIServicesKindObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCBKindObject()
      * @generated
      */
-    int TACSI_SERVICES_KIND_OBJECT = 58;
+    int CB_KIND_OBJECT = 59;
 
     /**
-     * The meta object id for the '<em>TAttribute Name</em>' data type.
+     * The meta object id for the '<em>Defined Attribute Type Kind Object</em>' data type.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAttributeName()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDefinedAttributeTypeKindObject()
      * @generated
      */
-    int TATTRIBUTE_NAME = 59;
+    int DEFINED_ATTRIBUTE_TYPE_KIND_OBJECT = 60;
 
     /**
-     * The meta object id for the '<em>TAttribute Type Kind</em>' data type.
+     * The meta object id for the '<em>License Kind Object</em>' data type.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.emf.common.util.Enumerator
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAttributeTypeKind()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLicenseKindObject()
      * @generated
      */
-    int TATTRIBUTE_TYPE_KIND = 60;
+    int LICENSE_KIND_OBJECT = 61;
 
     /**
-     * The meta object id for the '<em>TBasic Type Name</em>' data type.
+     * The meta object id for the '<em>Pub Stage Object</em>' data type.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTBasicTypeName()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getPubStageObject()
      * @generated
      */
-    int TBASIC_TYPE_NAME = 61;
+    int PUB_STAGE_OBJECT = 62;
 
     /**
-     * The meta object id for the '<em>TCB Kind Object</em>' data type.
+     * The meta object id for the '<em>Undefined Attribute Type Kind Object</em>' data type.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCBKindObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getUndefinedAttributeTypeKindObject()
      * @generated
      */
-    int TCB_KIND_OBJECT = 62;
+    int UNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT = 63;
 
     /**
-     * The meta object id for the '<em>TCDC Name</em>' data type.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType <em>Applies To Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCDCName()
+     * @return the meta object for class '<em>Applies To Type</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType
      * @generated
      */
-    int TCDC_NAME = 63;
+    EClass getAppliesToType();
 
     /**
-     * The meta object id for the '<em>TData Object Name</em>' data type.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getId <em>Id</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDataObjectName()
+     * @return the meta object for the attribute '<em>Id</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getId()
+     * @see #getAppliesToType()
      * @generated
      */
-    int TDATA_OBJECT_NAME = 64;
+    EAttribute getAppliesToType_Id();
 
     /**
-     * The meta object id for the '<em>TDefined Attribute Type Kind Object</em>' data type.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getPublicationStage <em>Publication Stage</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDefinedAttributeTypeKindObject()
+     * @return the meta object for the attribute '<em>Publication Stage</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getPublicationStage()
+     * @see #getAppliesToType()
      * @generated
      */
-    int TDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT = 65;
+    EAttribute getAppliesToType_PublicationStage();
 
     /**
-     * The meta object id for the '<em>TDoc ID</em>' data type.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRevision <em>Revision</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDocID()
+     * @return the meta object for the attribute '<em>Revision</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRevision()
+     * @see #getAppliesToType()
      * @generated
      */
-    int TDOC_ID = 66;
+    EAttribute getAppliesToType_Revision();
 
     /**
-     * The meta object id for the '<em>TEmpty String</em>' data type.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType <em>Depends On Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTEmptyString()
+     * @return the meta object for class '<em>Depends On Type</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType
      * @generated
      */
-    int TEMPTY_STRING = 67;
+    EClass getDependsOnType();
 
     /**
-     * The meta object id for the '<em>TFC Abbreviation</em>' data type.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getId <em>Id</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTFCAbbreviation()
+     * @return the meta object for the attribute '<em>Id</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getId()
+     * @see #getDependsOnType()
      * @generated
      */
-    int TFC_ABBREVIATION = 68;
+    EAttribute getDependsOnType_Id();
 
     /**
-     * The meta object id for the '<em>TIec61850 Name</em>' data type.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getPublicationStage <em>Publication Stage</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTIec61850Name()
+     * @return the meta object for the attribute '<em>Publication Stage</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getPublicationStage()
+     * @see #getDependsOnType()
      * @generated
      */
-    int TIEC61850_NAME = 69;
+    EAttribute getDependsOnType_PublicationStage();
 
     /**
-     * The meta object id for the '<em>TIec61850 Name String</em>' data type.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRevision <em>Revision</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTIec61850NameString()
+     * @return the meta object for the attribute '<em>Revision</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRevision()
+     * @see #getDependsOnType()
      * @generated
      */
-    int TIEC61850_NAME_STRING = 70;
+    EAttribute getDependsOnType_Revision();
 
     /**
-     * The meta object id for the '<em>Tissues Type</em>' data type.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot <em>Document Root</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTissuesType()
+     * @return the meta object for class '<em>Document Root</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot
      * @generated
      */
-    int TISSUES_TYPE = 71;
+    EClass getDocumentRoot();
 
     /**
-     * The meta object id for the '<em>TLicense Kind Object</em>' data type.
+     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getMixed <em>Mixed</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLicenseKindObject()
+     * @return the meta object for the attribute list '<em>Mixed</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getMixed()
+     * @see #getDocumentRoot()
      * @generated
      */
-    int TLICENSE_KIND_OBJECT = 72;
+    EAttribute getDocumentRoot_Mixed();
 
     /**
-     * The meta object id for the '<em>TLiteral Name</em>' data type.
+     * Returns the meta object for the map '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLiteralName()
+     * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getXMLNSPrefixMap()
+     * @see #getDocumentRoot()
      * @generated
      */
-    int TLITERAL_NAME = 73;
+    EReference getDocumentRoot_XMLNSPrefixMap();
 
     /**
-     * The meta object id for the '<em>TLN Class Name</em>' data type.
+     * Returns the meta object for the map '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLNClassName()
+     * @return the meta object for the map '<em>XSI Schema Location</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getXSISchemaLocation()
+     * @see #getDocumentRoot()
      * @generated
      */
-    int TLN_CLASS_NAME = 74;
+    EReference getDocumentRoot_XSISchemaLocation();
 
     /**
-     * The meta object id for the '<em>TNS Identifier</em>' data type.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getApplicableServiceNS <em>Applicable Service NS</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSIdentifier()
+     * @return the meta object for the containment reference '<em>Applicable Service NS</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getApplicableServiceNS()
+     * @see #getDocumentRoot()
      * @generated
      */
-    int TNS_IDENTIFIER = 75;
+    EReference getDocumentRoot_ApplicableServiceNS();
 
     /**
-     * The meta object id for the '<em>TNS Release</em>' data type.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getCopyright <em>Copyright</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSRelease()
+     * @return the meta object for the containment reference '<em>Copyright</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getCopyright()
+     * @see #getDocumentRoot()
      * @generated
      */
-    int TNS_RELEASE = 76;
+    EReference getDocumentRoot_Copyright();
 
     /**
-     * The meta object id for the '<em>TNS Release Object</em>' data type.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNS <em>NS</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.Short
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSReleaseObject()
+     * @return the meta object for the containment reference '<em>NS</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNS()
+     * @see #getDocumentRoot()
      * @generated
      */
-    int TNS_RELEASE_OBJECT = 77;
+    EReference getDocumentRoot_NS();
 
     /**
-     * The meta object id for the '<em>TNS Revision</em>' data type.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNSDoc <em>NS Doc</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSRevision()
+     * @return the meta object for the containment reference '<em>NS Doc</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNSDoc()
+     * @see #getDocumentRoot()
      * @generated
      */
-    int TNS_REVISION = 78;
+    EReference getDocumentRoot_NSDoc();
 
     /**
-     * The meta object id for the '<em>TNS Version</em>' data type.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getServiceNS <em>Service NS</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSVersion()
+     * @return the meta object for the containment reference '<em>Service NS</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getServiceNS()
+     * @see #getDocumentRoot()
      * @generated
      */
-    int TNS_VERSION = 79;
+    EReference getDocumentRoot_ServiceNS();
 
     /**
-     * The meta object id for the '<em>TNS Version Object</em>' data type.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType <em>Service Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.Integer
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSVersionObject()
+     * @return the meta object for class '<em>Service Type</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType
      * @generated
      */
-    int TNS_VERSION_OBJECT = 80;
+    EClass getServiceType();
 
     /**
-     * The meta object id for the '<em>TPresence Condition Argument</em>' data type.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPresenceConditionArgument()
+     * @return the meta object for the attribute '<em>Name</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType#getName()
+     * @see #getServiceType()
      * @generated
      */
-    int TPRESENCE_CONDITION_ARGUMENT = 81;
+    EAttribute getServiceType_Name();
 
     /**
-     * The meta object id for the '<em>TPresence Condition Name</em>' data type.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation <em>Abbreviation</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPresenceConditionName()
+     * @return the meta object for class '<em>Abbreviation</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation
      * @generated
      */
-    int TPRESENCE_CONDITION_NAME = 82;
+    EClass getAbbreviation();
 
     /**
-     * The meta object id for the '<em>TPub Stage Object</em>' data type.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation#getDescID <em>Desc ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPubStageObject()
+     * @return the meta object for the attribute '<em>Desc ID</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation#getDescID()
+     * @see #getAbbreviation()
      * @generated
      */
-    int TPUB_STAGE_OBJECT = 83;
+    EAttribute getAbbreviation_DescID();
 
     /**
-     * The meta object id for the '<em>TSub Data Object Name</em>' data type.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTSubDataObjectName()
+     * @return the meta object for the attribute '<em>Name</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation#getName()
+     * @see #getAbbreviation()
      * @generated
      */
-    int TSUB_DATA_OBJECT_NAME = 84;
+    EAttribute getAbbreviation_Name();
 
     /**
-     * The meta object id for the '<em>TUML Version</em>' data type.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations <em>Abbreviations</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see java.lang.String
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTUMLVersion()
+     * @return the meta object for class '<em>Abbreviations</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations
      * @generated
      */
-    int TUML_VERSION = 85;
+    EClass getAbbreviations();
 
     /**
-     * The meta object id for the '<em>TUndefined Attribute Type Kind Object</em>' data type.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations#getAbbreviation <em>Abbreviation</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTUndefinedAttributeTypeKindObject()
+     * @return the meta object for the containment reference list '<em>Abbreviation</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations#getAbbreviation()
+     * @see #getAbbreviations()
      * @generated
      */
-    int TUNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT = 86;
+    EReference getAbbreviations_Abbreviation();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType <em>Applies To Type</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass <em>Abstract LN Class</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Applies To Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType
+     * @return the meta object for class '<em>Abstract LN Class</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass
      * @generated
      */
-    EClass getAppliesToType();
+    EClass getAbstractLNClass();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getId <em>Id</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Id</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getId()
-     * @see #getAppliesToType()
-     * @generated
-     */
-    EAttribute getAppliesToType_Id();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getPublicationStage <em>Publication Stage</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Publication Stage</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getPublicationStage()
-     * @see #getAppliesToType()
-     * @generated
-     */
-    EAttribute getAppliesToType_PublicationStage();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRelease <em>Release</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Release</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRelease()
-     * @see #getAppliesToType()
-     * @generated
-     */
-    EAttribute getAppliesToType_Release();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRevision <em>Revision</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Revision</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getRevision()
-     * @see #getAppliesToType()
-     * @generated
-     */
-    EAttribute getAppliesToType_Revision();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getVersion <em>Version</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType#getVersion()
-     * @see #getAppliesToType()
-     * @generated
-     */
-    EAttribute getAppliesToType_Version();
-
-    /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType <em>Depends On Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Depends On Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType
-     * @generated
-     */
-    EClass getDependsOnType();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getId <em>Id</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Id</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getId()
-     * @see #getDependsOnType()
-     * @generated
-     */
-    EAttribute getDependsOnType_Id();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getPublicationStage <em>Publication Stage</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Publication Stage</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getPublicationStage()
-     * @see #getDependsOnType()
-     * @generated
-     */
-    EAttribute getDependsOnType_PublicationStage();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRelease <em>Release</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Release</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRelease()
-     * @see #getDependsOnType()
-     * @generated
-     */
-    EAttribute getDependsOnType_Release();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRevision <em>Revision</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Revision</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getRevision()
-     * @see #getDependsOnType()
-     * @generated
-     */
-    EAttribute getDependsOnType_Revision();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getVersion <em>Version</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType#getVersion()
-     * @see #getDependsOnType()
-     * @generated
-     */
-    EAttribute getDependsOnType_Version();
-
-    /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot <em>Document Root</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Document Root</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot
-     * @generated
-     */
-    EClass getDocumentRoot();
-
-    /**
-     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getMixed <em>Mixed</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute list '<em>Mixed</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getMixed()
-     * @see #getDocumentRoot()
-     * @generated
-     */
-    EAttribute getDocumentRoot_Mixed();
-
-    /**
-     * Returns the meta object for the map '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getXMLNSPrefixMap()
-     * @see #getDocumentRoot()
-     * @generated
-     */
-    EReference getDocumentRoot_XMLNSPrefixMap();
-
-    /**
-     * Returns the meta object for the map '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the map '<em>XSI Schema Location</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getXSISchemaLocation()
-     * @see #getDocumentRoot()
-     * @generated
-     */
-    EReference getDocumentRoot_XSISchemaLocation();
-
-    /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getApplicableServiceNS <em>Applicable Service NS</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Applicable Service NS</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getApplicableServiceNS()
-     * @see #getDocumentRoot()
-     * @generated
-     */
-    EReference getDocumentRoot_ApplicableServiceNS();
-
-    /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getCopyright <em>Copyright</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Copyright</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getCopyright()
-     * @see #getDocumentRoot()
-     * @generated
-     */
-    EReference getDocumentRoot_Copyright();
-
-    /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNS <em>NS</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>NS</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNS()
-     * @see #getDocumentRoot()
-     * @generated
-     */
-    EReference getDocumentRoot_NS();
-
-    /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNSDoc <em>NS Doc</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>NS Doc</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getNSDoc()
-     * @see #getDocumentRoot()
-     * @generated
-     */
-    EReference getDocumentRoot_NSDoc();
-
-    /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getServiceNS <em>Service NS</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Service NS</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot#getServiceNS()
-     * @see #getDocumentRoot()
-     * @generated
-     */
-    EReference getDocumentRoot_ServiceNS();
-
-    /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType <em>Service Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Service Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType
-     * @generated
-     */
-    EClass getServiceType();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType#getName()
-     * @see #getServiceType()
-     * @generated
-     */
-    EAttribute getServiceType_Name();
-
-    /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation <em>TAbbreviation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TAbbreviation</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation
-     * @generated
-     */
-    EClass getTAbbreviation();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation#getDescID <em>Desc ID</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Desc ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation#getDescID()
-     * @see #getTAbbreviation()
-     * @generated
-     */
-    EAttribute getTAbbreviation_DescID();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation#getName()
-     * @see #getTAbbreviation()
-     * @generated
-     */
-    EAttribute getTAbbreviation_Name();
-
-    /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations <em>TAbbreviations</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TAbbreviations</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations
-     * @generated
-     */
-    EClass getTAbbreviations();
-
-    /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations#getAbbreviation <em>Abbreviation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Abbreviation</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations#getAbbreviation()
-     * @see #getTAbbreviations()
-     * @generated
-     */
-    EReference getTAbbreviations_Abbreviation();
-
-    /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass <em>TAbstract LN Class</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TAbstract LN Class</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass
-     * @generated
-     */
-    EClass getTAbstractLNClass();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass#getName()
-     * @see #getTAbstractLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass#getName()
+     * @see #getAbstractLNClass()
      * @generated
      */
-    EAttribute getTAbstractLNClass_Name();
+    EAttribute getAbstractLNClass_Name();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass <em>TAny LN Class</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass <em>Any LN Class</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TAny LN Class</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass
+     * @return the meta object for class '<em>Any LN Class</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass
      * @generated
      */
-    EClass getTAnyLNClass();
+    EClass getAnyLNClass();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass#getDataObject <em>Data Object</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass#getDataObject <em>Data Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Data Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass#getDataObject()
-     * @see #getTAnyLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass#getDataObject()
+     * @see #getAnyLNClass()
      * @generated
      */
-    EReference getTAnyLNClass_DataObject();
+    EReference getAnyLNClass_DataObject();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass#getBase <em>Base</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass#getBase <em>Base</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Base</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass#getBase()
-     * @see #getTAnyLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass#getBase()
+     * @see #getAnyLNClass()
      * @generated
      */
-    EAttribute getTAnyLNClass_Base();
+    EAttribute getAnyLNClass_Base();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS <em>TApplicable Service NS</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS <em>Applicable Service NS</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TApplicable Service NS</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS
+     * @return the meta object for class '<em>Applicable Service NS</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS
      * @generated
      */
-    EClass getTApplicableServiceNS();
+    EClass getApplicableServiceNS();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getServiceNsUsage <em>Service Ns Usage</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getServiceNsUsage <em>Service Ns Usage</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Service Ns Usage</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getServiceNsUsage()
-     * @see #getTApplicableServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getServiceNsUsage()
+     * @see #getApplicableServiceNS()
      * @generated
      */
-    EReference getTApplicableServiceNS_ServiceNsUsage();
+    EReference getApplicableServiceNS_ServiceNsUsage();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getDate <em>Date</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getDate <em>Date</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Date</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getDate()
-     * @see #getTApplicableServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getDate()
+     * @see #getApplicableServiceNS()
      * @generated
      */
-    EAttribute getTApplicableServiceNS_Date();
+    EAttribute getApplicableServiceNS_Date();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getVersion <em>Version</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getVersion <em>Version</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS#getVersion()
-     * @see #getTApplicableServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS#getVersion()
+     * @see #getApplicableServiceNS()
      * @generated
      */
-    EAttribute getTApplicableServiceNS_Version();
+    EAttribute getApplicableServiceNS_Version();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices <em>TApplicable Services</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices <em>Applicable Services</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TApplicable Services</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices
+     * @return the meta object for class '<em>Applicable Services</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices
      * @generated
      */
-    EClass getTApplicableServices();
+    EClass getApplicableServices();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices#getService <em>Service</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices#getService <em>Service</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Service</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices#getService()
-     * @see #getTApplicableServices()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices#getService()
+     * @see #getApplicableServices()
      * @generated
      */
-    EReference getTApplicableServices_Service();
+    EReference getApplicableServices_Service();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices#getDataSetMemberOf <em>Data Set Member Of</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices#getDataSetMemberOf <em>Data Set Member Of</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Data Set Member Of</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices#getDataSetMemberOf()
-     * @see #getTApplicableServices()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices#getDataSetMemberOf()
+     * @see #getApplicableServices()
      * @generated
      */
-    EReference getTApplicableServices_DataSetMemberOf();
+    EReference getApplicableServices_DataSetMemberOf();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType <em>TBasic Type</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType <em>Basic Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TBasic Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType
+     * @return the meta object for class '<em>Basic Type</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType
      * @generated
      */
-    EClass getTBasicType();
+    EClass getBasicType();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType#getDescID <em>Desc ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType#getDescID <em>Desc ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Desc ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType#getDescID()
-     * @see #getTBasicType()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType#getDescID()
+     * @see #getBasicType()
      * @generated
      */
-    EAttribute getTBasicType_DescID();
+    EAttribute getBasicType_DescID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType#getName()
-     * @see #getTBasicType()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType#getName()
+     * @see #getBasicType()
      * @generated
      */
-    EAttribute getTBasicType_Name();
+    EAttribute getBasicType_Name();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes <em>TBasic Types</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes <em>Basic Types</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TBasic Types</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes
+     * @return the meta object for class '<em>Basic Types</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes
      * @generated
      */
-    EClass getTBasicTypes();
+    EClass getBasicTypes();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes#getBasicType <em>Basic Type</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes#getBasicType <em>Basic Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Basic Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes#getBasicType()
-     * @see #getTBasicTypes()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes#getBasicType()
+     * @see #getBasicTypes()
      * @generated
      */
-    EReference getTBasicTypes_BasicType();
+    EReference getBasicTypes_BasicType();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC <em>TCDC</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC <em>CDC</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TCDC</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC
+     * @return the meta object for class '<em>CDC</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC
      * @generated
      */
-    EClass getTCDC();
+    EClass getCDC();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getSubDataObject <em>Sub Data Object</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getSubDataObject <em>Sub Data Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Sub Data Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getSubDataObject()
-     * @see #getTCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getSubDataObject()
+     * @see #getCDC()
      * @generated
      */
-    EReference getTCDC_SubDataObject();
+    EReference getCDC_SubDataObject();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getDataAttribute <em>Data Attribute</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getDataAttribute <em>Data Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Data Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getDataAttribute()
-     * @see #getTCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getDataAttribute()
+     * @see #getCDC()
      * @generated
      */
-    EReference getTCDC_DataAttribute();
+    EReference getCDC_DataAttribute();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getServiceParameter <em>Service Parameter</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getServiceParameter <em>Service Parameter</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Service Parameter</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getServiceParameter()
-     * @see #getTCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getServiceParameter()
+     * @see #getCDC()
      * @generated
      */
-    EReference getTCDC_ServiceParameter();
+    EReference getCDC_ServiceParameter();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isEnumParameterized <em>Enum Parameterized</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isEnumParameterized <em>Enum Parameterized</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Enum Parameterized</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isEnumParameterized()
-     * @see #getTCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isEnumParameterized()
+     * @see #getCDC()
      * @generated
      */
-    EAttribute getTCDC_EnumParameterized();
+    EAttribute getCDC_EnumParameterized();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getName()
-     * @see #getTCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getName()
+     * @see #getCDC()
      * @generated
      */
-    EAttribute getTCDC_Name();
+    EAttribute getCDC_Name();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isStatistics <em>Statistics</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isStatistics <em>Statistics</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Statistics</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isStatistics()
-     * @see #getTCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isStatistics()
+     * @see #getCDC()
      * @generated
      */
-    EAttribute getTCDC_Statistics();
+    EAttribute getCDC_Statistics();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isTypeKindParameterized <em>Type Kind Parameterized</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type Kind Parameterized</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#isTypeKindParameterized()
-     * @see #getTCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#isTypeKindParameterized()
+     * @see #getCDC()
      * @generated
      */
-    EAttribute getTCDC_TypeKindParameterized();
+    EAttribute getCDC_TypeKindParameterized();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getVariant <em>Variant</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getVariant <em>Variant</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Variant</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC#getVariant()
-     * @see #getTCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC#getVariant()
+     * @see #getCDC()
      * @generated
      */
-    EAttribute getTCDC_Variant();
+    EAttribute getCDC_Variant();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs <em>TCD Cs</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs <em>CD Cs</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TCD Cs</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs
+     * @return the meta object for class '<em>CD Cs</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs
      * @generated
      */
-    EClass getTCDCs();
+    EClass getCDCs();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs#getCDC <em>CDC</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs#getCDC <em>CDC</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>CDC</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs#getCDC()
-     * @see #getTCDCs()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs#getCDC()
+     * @see #getCDCs()
      * @generated
      */
-    EReference getTCDCs_CDC();
+    EReference getCDCs_CDC();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges <em>TChanges</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes <em>Changes</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TChanges</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges
+     * @return the meta object for class '<em>Changes</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes
      * @generated
      */
-    EClass getTChanges();
+    EClass getChanges();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getChangesID <em>Changes ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getChangesID <em>Changes ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Changes ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getChangesID()
-     * @see #getTChanges()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getChangesID()
+     * @see #getChanges()
      * @generated
      */
-    EAttribute getTChanges_ChangesID();
+    EAttribute getChanges_ChangesID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getDate <em>Date</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getDate <em>Date</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Date</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getDate()
-     * @see #getTChanges()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getDate()
+     * @see #getChanges()
      * @generated
      */
-    EAttribute getTChanges_Date();
+    EAttribute getChanges_Date();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRelease <em>Release</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Release</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRelease()
-     * @see #getTChanges()
-     * @generated
-     */
-    EAttribute getTChanges_Release();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRevision <em>Revision</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getRevision <em>Revision</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Revision</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRevision()
-     * @see #getTChanges()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getRevision()
+     * @see #getChanges()
      * @generated
      */
-    EAttribute getTChanges_Revision();
+    EAttribute getChanges_Revision();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getTissues <em>Tissues</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getTissues <em>Tissues</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Tissues</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getTissues()
-     * @see #getTChanges()
-     * @generated
-     */
-    EAttribute getTChanges_Tissues();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getVersion <em>Version</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getVersion()
-     * @see #getTChanges()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes#getTissues()
+     * @see #getChanges()
      * @generated
      */
-    EAttribute getTChanges_Version();
+    EAttribute getChanges_Tissues();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute <em>TConstructed Attribute</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute <em>Constructed Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TConstructed Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute
+     * @return the meta object for class '<em>Constructed Attribute</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute
      * @generated
      */
-    EClass getTConstructedAttribute();
+    EClass getConstructedAttribute();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute#getSubDataAttribute <em>Sub Data Attribute</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute#getSubDataAttribute <em>Sub Data Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Sub Data Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute#getSubDataAttribute()
-     * @see #getTConstructedAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute#getSubDataAttribute()
+     * @see #getConstructedAttribute()
      * @generated
      */
-    EReference getTConstructedAttribute_SubDataAttribute();
+    EReference getConstructedAttribute_SubDataAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute#getName()
-     * @see #getTConstructedAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute#getName()
+     * @see #getConstructedAttribute()
      * @generated
      */
-    EAttribute getTConstructedAttribute_Name();
+    EAttribute getConstructedAttribute_Name();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes <em>TConstructed Attributes</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes <em>Constructed Attributes</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TConstructed Attributes</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes
+     * @return the meta object for class '<em>Constructed Attributes</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes
      * @generated
      */
-    EClass getTConstructedAttributes();
+    EClass getConstructedAttributes();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes#getConstructedAttribute <em>Constructed Attribute</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes#getConstructedAttribute <em>Constructed Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Constructed Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes#getConstructedAttribute()
-     * @see #getTConstructedAttributes()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes#getConstructedAttribute()
+     * @see #getConstructedAttributes()
      * @generated
      */
-    EReference getTConstructedAttributes_ConstructedAttribute();
+    EReference getConstructedAttributes_ConstructedAttribute();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted <em>TCopyrighted</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted <em>Copyrighted</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TCopyrighted</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted
+     * @return the meta object for class '<em>Copyrighted</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted
      * @generated
      */
-    EClass getTCopyrighted();
+    EClass getCopyrighted();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted#getCopyright <em>Copyright</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted#getCopyright <em>Copyright</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Copyright</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted#getCopyright()
-     * @see #getTCopyrighted()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted#getCopyright()
+     * @see #getCopyrighted()
      * @generated
      */
-    EReference getTCopyrighted_Copyright();
+    EReference getCopyrighted_Copyright();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice <em>TCopyright Notice</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice <em>Copyright Notice</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TCopyright Notice</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice
+     * @return the meta object for class '<em>Copyright Notice</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice
      * @generated
      */
-    EClass getTCopyrightNotice();
+    EClass getCopyrightNotice();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice#getNotice <em>Notice</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice#getNotice <em>Notice</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Notice</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice#getNotice()
-     * @see #getTCopyrightNotice()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice#getNotice()
+     * @see #getCopyrightNotice()
      * @generated
      */
-    EReference getTCopyrightNotice_Notice();
+    EReference getCopyrightNotice_Notice();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice#getLicense <em>License</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice#getLicense <em>License</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>License</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice#getLicense()
-     * @see #getTCopyrightNotice()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice#getLicense()
+     * @see #getCopyrightNotice()
      * @generated
      */
-    EReference getTCopyrightNotice_License();
+    EReference getCopyrightNotice_License();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute <em>TData Attribute</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute <em>Data Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TData Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute
+     * @return the meta object for class '<em>Data Attribute</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute
      * @generated
      */
-    EClass getTDataAttribute();
+    EClass getDataAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDchg <em>Dchg</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDchg <em>Dchg</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Dchg</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDchg()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDchg()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_Dchg();
+    EAttribute getDataAttribute_Dchg();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getDefaultValue <em>Default Value</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getDefaultValue <em>Default Value</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Default Value</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getDefaultValue()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getDefaultValue()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_DefaultValue();
+    EAttribute getDataAttribute_DefaultValue();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDupd <em>Dupd</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDupd <em>Dupd</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Dupd</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isDupd()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isDupd()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_Dupd();
+    EAttribute getDataAttribute_Dupd();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getFc <em>Fc</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getFc <em>Fc</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Fc</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getFc()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getFc()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_Fc();
+    EAttribute getDataAttribute_Fc();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isIsArray <em>Is Array</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isIsArray <em>Is Array</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Is Array</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isIsArray()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isIsArray()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_IsArray();
+    EAttribute getDataAttribute_IsArray();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Max Index Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMaxIndexAttribute()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMaxIndexAttribute()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_MaxIndexAttribute();
+    EAttribute getDataAttribute_MaxIndexAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMaxValue <em>Max Value</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMaxValue <em>Max Value</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Max Value</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMaxValue()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMaxValue()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_MaxValue();
+    EAttribute getDataAttribute_MaxValue();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinIndex <em>Min Index</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinIndex <em>Min Index</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Min Index</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinIndex()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinIndex()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_MinIndex();
+    EAttribute getDataAttribute_MinIndex();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinValue <em>Min Value</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinValue <em>Min Value</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Min Value</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getMinValue()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getMinValue()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_MinValue();
+    EAttribute getDataAttribute_MinValue();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getName()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getName()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_Name();
+    EAttribute getDataAttribute_Name();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCond <em>Pres Cond</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCond <em>Pres Cond</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCond()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCond()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_PresCond();
+    EAttribute getDataAttribute_PresCond();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCondArgs <em>Pres Cond Args</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCondArgs()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCondArgs()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_PresCondArgs();
+    EAttribute getDataAttribute_PresCondArgs();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getPresCondArgsID()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getPresCondArgsID()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_PresCondArgsID();
+    EAttribute getDataAttribute_PresCondArgsID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isQchg <em>Qchg</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isQchg <em>Qchg</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Qchg</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#isQchg()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#isQchg()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_Qchg();
+    EAttribute getDataAttribute_Qchg();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getSizeAttribute <em>Size Attribute</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getSizeAttribute <em>Size Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Size Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getSizeAttribute()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getSizeAttribute()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_SizeAttribute();
+    EAttribute getDataAttribute_SizeAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getType <em>Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getType <em>Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getType()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getType()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_Type();
+    EAttribute getDataAttribute_Type();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getTypeKind <em>Type Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getTypeKind <em>Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute#getTypeKind()
-     * @see #getTDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute#getTypeKind()
+     * @see #getDataAttribute()
      * @generated
      */
-    EAttribute getTDataAttribute_TypeKind();
+    EAttribute getDataAttribute_TypeKind();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject <em>TData Object</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject <em>Data Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TData Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject
+     * @return the meta object for class '<em>Data Object</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject
      * @generated
      */
-    EClass getTDataObject();
+    EClass getDataObject();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCond <em>Ds Pres Cond</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCond <em>Ds Pres Cond</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Ds Pres Cond</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCond()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCond()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_DsPresCond();
+    EAttribute getDataObject_DsPresCond();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCondArgs <em>Ds Pres Cond Args</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCondArgs <em>Ds Pres Cond Args</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Ds Pres Cond Args</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCondArgs()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCondArgs()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_DsPresCondArgs();
+    EAttribute getDataObject_DsPresCondArgs();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCondArgsID <em>Ds Pres Cond Args ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCondArgsID <em>Ds Pres Cond Args ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Ds Pres Cond Args ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getDsPresCondArgsID()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getDsPresCondArgsID()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_DsPresCondArgsID();
+    EAttribute getDataObject_DsPresCondArgsID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getName()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getName()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_Name();
+    EAttribute getDataObject_Name();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCond <em>Pres Cond</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCond <em>Pres Cond</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCond()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCond()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_PresCond();
+    EAttribute getDataObject_PresCond();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCondArgs <em>Pres Cond Args</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCondArgs <em>Pres Cond Args</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCondArgs()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCondArgs()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_PresCondArgs();
+    EAttribute getDataObject_PresCondArgs();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getPresCondArgsID()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getPresCondArgsID()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_PresCondArgsID();
+    EAttribute getDataObject_PresCondArgsID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#isTransient <em>Transient</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#isTransient <em>Transient</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Transient</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#isTransient()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#isTransient()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_Transient();
+    EAttribute getDataObject_Transient();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getType <em>Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getType <em>Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getType()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getType()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_Type();
+    EAttribute getDataObject_Type();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingType <em>Underlying Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingType <em>Underlying Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Underlying Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingType()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingType()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_UnderlyingType();
+    EAttribute getDataObject_UnderlyingType();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Underlying Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject#getUnderlyingTypeKind()
-     * @see #getTDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject#getUnderlyingTypeKind()
+     * @see #getDataObject()
      * @generated
      */
-    EAttribute getTDataObject_UnderlyingTypeKind();
+    EAttribute getDataObject_UnderlyingTypeKind();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf <em>TData Set Member Of</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf <em>Data Set Member Of</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TData Set Member Of</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf
+     * @return the meta object for class '<em>Data Set Member Of</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf
      * @generated
      */
-    EClass getTDataSetMemberOf();
+    EClass getDataSetMemberOf();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf#getCb <em>Cb</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf#getCb <em>Cb</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Cb</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf#getCb()
-     * @see #getTDataSetMemberOf()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf#getCb()
+     * @see #getDataSetMemberOf()
      * @generated
      */
-    EAttribute getTDataSetMemberOf_Cb();
+    EAttribute getDataSetMemberOf_Cb();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc <em>TDoc</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc <em>Doc</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TDoc</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc
+     * @return the meta object for class '<em>Doc</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc
      * @generated
      */
-    EClass getTDoc();
+    EClass getDoc();
 
     /**
-     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getMixed <em>Mixed</em>}'.
+     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getMixed <em>Mixed</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute list '<em>Mixed</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getMixed()
-     * @see #getTDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getMixed()
+     * @see #getDoc()
      * @generated
      */
-    EAttribute getTDoc_Mixed();
+    EAttribute getDoc_Mixed();
 
     /**
-     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getGroup <em>Group</em>}'.
+     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getGroup <em>Group</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute list '<em>Group</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getGroup()
-     * @see #getTDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getGroup()
+     * @see #getDoc()
      * @generated
      */
-    EAttribute getTDoc_Group();
+    EAttribute getDoc_Group();
 
     /**
-     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getAny <em>Any</em>}'.
+     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getAny <em>Any</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute list '<em>Any</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getAny()
-     * @see #getTDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getAny()
+     * @see #getDoc()
      * @generated
      */
-    EAttribute getTDoc_Any();
+    EAttribute getDoc_Any();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getId <em>Id</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getId <em>Id</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Id</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc#getId()
-     * @see #getTDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getId()
+     * @see #getDoc()
      * @generated
      */
-    EAttribute getTDoc_Id();
+    EAttribute getDoc_Id();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass <em>TDocumented Class</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass <em>Documented Class</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TDocumented Class</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass
+     * @return the meta object for class '<em>Documented Class</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass
      * @generated
      */
-    EClass getTDocumentedClass();
+    EClass getDocumentedClass();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isDeprecated <em>Deprecated</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isDeprecated <em>Deprecated</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Deprecated</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isDeprecated()
-     * @see #getTDocumentedClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isDeprecated()
+     * @see #getDocumentedClass()
      * @generated
      */
-    EAttribute getTDocumentedClass_Deprecated();
+    EAttribute getDocumentedClass_Deprecated();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#getDescID <em>Desc ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getDescID <em>Desc ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Desc ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#getDescID()
-     * @see #getTDocumentedClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getDescID()
+     * @see #getDocumentedClass()
      * @generated
      */
-    EAttribute getTDocumentedClass_DescID();
+    EAttribute getDocumentedClass_DescID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isInformative <em>Informative</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isInformative <em>Informative</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Informative</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass#isInformative()
-     * @see #getTDocumentedClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isInformative()
+     * @see #getDocumentedClass()
      * @generated
      */
-    EAttribute getTDocumentedClass_Informative();
+    EAttribute getDocumentedClass_Informative();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration <em>TEnumeration</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration <em>Enumeration</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TEnumeration</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration
+     * @return the meta object for class '<em>Enumeration</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration
      * @generated
      */
-    EClass getTEnumeration();
+    EClass getEnumeration();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getLiteral <em>Literal</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getLiteral <em>Literal</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Literal</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getLiteral()
-     * @see #getTEnumeration()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getLiteral()
+     * @see #getEnumeration()
      * @generated
      */
-    EReference getTEnumeration_Literal();
+    EReference getEnumeration_Literal();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getInheritedFrom <em>Inherited From</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getInheritedFrom <em>Inherited From</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Inherited From</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getInheritedFrom()
-     * @see #getTEnumeration()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getInheritedFrom()
+     * @see #getEnumeration()
      * @generated
      */
-    EAttribute getTEnumeration_InheritedFrom();
+    EAttribute getEnumeration_InheritedFrom();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration#getName()
-     * @see #getTEnumeration()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration#getName()
+     * @see #getEnumeration()
      * @generated
      */
-    EAttribute getTEnumeration_Name();
+    EAttribute getEnumeration_Name();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations <em>TEnumerations</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations <em>Enumerations</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TEnumerations</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations
+     * @return the meta object for class '<em>Enumerations</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations
      * @generated
      */
-    EClass getTEnumerations();
+    EClass getEnumerations();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations#getEnumeration <em>Enumeration</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations#getEnumeration <em>Enumeration</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Enumeration</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations#getEnumeration()
-     * @see #getTEnumerations()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations#getEnumeration()
+     * @see #getEnumerations()
      * @generated
      */
-    EReference getTEnumerations_Enumeration();
+    EReference getEnumerations_Enumeration();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint <em>TFunctional Constraint</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint <em>Functional Constraint</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TFunctional Constraint</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint
+     * @return the meta object for class '<em>Functional Constraint</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint
      * @generated
      */
-    EClass getTFunctionalConstraint();
+    EClass getFunctionalConstraint();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getApplicableServices <em>Applicable Services</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getApplicableServices <em>Applicable Services</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Applicable Services</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getApplicableServices()
-     * @see #getTFunctionalConstraint()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getApplicableServices()
+     * @see #getFunctionalConstraint()
      * @generated
      */
-    EReference getTFunctionalConstraint_ApplicableServices();
+    EReference getFunctionalConstraint_ApplicableServices();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getAbbreviation <em>Abbreviation</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getAbbreviation <em>Abbreviation</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Abbreviation</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getAbbreviation()
-     * @see #getTFunctionalConstraint()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getAbbreviation()
+     * @see #getFunctionalConstraint()
      * @generated
      */
-    EAttribute getTFunctionalConstraint_Abbreviation();
+    EAttribute getFunctionalConstraint_Abbreviation();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getDescID <em>Desc ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getDescID <em>Desc ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Desc ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getDescID()
-     * @see #getTFunctionalConstraint()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getDescID()
+     * @see #getFunctionalConstraint()
      * @generated
      */
-    EAttribute getTFunctionalConstraint_DescID();
+    EAttribute getFunctionalConstraint_DescID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getTitleID <em>Title ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getTitleID <em>Title ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Title ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint#getTitleID()
-     * @see #getTFunctionalConstraint()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getTitleID()
+     * @see #getFunctionalConstraint()
      * @generated
      */
-    EAttribute getTFunctionalConstraint_TitleID();
+    EAttribute getFunctionalConstraint_TitleID();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints <em>TFunctional Constraints</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints <em>Functional Constraints</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TFunctional Constraints</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints
+     * @return the meta object for class '<em>Functional Constraints</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints
      * @generated
      */
-    EClass getTFunctionalConstraints();
+    EClass getFunctionalConstraints();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints#getFunctionalConstraint <em>Functional Constraint</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints#getFunctionalConstraint <em>Functional Constraint</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Functional Constraint</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints#getFunctionalConstraint()
-     * @see #getTFunctionalConstraints()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints#getFunctionalConstraint()
+     * @see #getFunctionalConstraints()
      * @generated
      */
-    EReference getTFunctionalConstraints_FunctionalConstraint();
+    EReference getFunctionalConstraints_FunctionalConstraint();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense <em>TLicense</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License <em>License</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TLicense</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense
+     * @return the meta object for class '<em>License</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.License
      * @generated
      */
-    EClass getTLicense();
+    EClass getLicense();
 
     /**
-     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getMixed <em>Mixed</em>}'.
+     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getMixed <em>Mixed</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute list '<em>Mixed</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getMixed()
-     * @see #getTLicense()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getMixed()
+     * @see #getLicense()
      * @generated
      */
-    EAttribute getTLicense_Mixed();
+    EAttribute getLicense_Mixed();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getKind <em>Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getKind <em>Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getKind()
-     * @see #getTLicense()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getKind()
+     * @see #getLicense()
      * @generated
      */
-    EAttribute getTLicense_Kind();
+    EAttribute getLicense_Kind();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getUri <em>Uri</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getUri <em>Uri</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Uri</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense#getUri()
-     * @see #getTLicense()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.License#getUri()
+     * @see #getLicense()
      * @generated
      */
-    EAttribute getTLicense_Uri();
+    EAttribute getLicense_Uri();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral <em>TLiteral</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal <em>Literal</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TLiteral</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral
+     * @return the meta object for class '<em>Literal</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal
      * @generated
      */
-    EClass getTLiteral();
+    EClass getLiteral();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getLiteralVal <em>Literal Val</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getLiteralVal <em>Literal Val</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Literal Val</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getLiteralVal()
-     * @see #getTLiteral()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getLiteralVal()
+     * @see #getLiteral()
      * @generated
      */
-    EAttribute getTLiteral_LiteralVal();
+    EAttribute getLiteral_LiteralVal();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral#getName()
-     * @see #getTLiteral()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal#getName()
+     * @see #getLiteral()
      * @generated
      */
-    EAttribute getTLiteral_Name();
+    EAttribute getLiteral_Name();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass <em>TLN Class</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass <em>LN Class</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TLN Class</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass
+     * @return the meta object for class '<em>LN Class</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass
      * @generated
      */
-    EClass getTLNClass();
+    EClass getLNClass();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isCanHaveLOG <em>Can Have LOG</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isCanHaveLOG <em>Can Have LOG</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Can Have LOG</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isCanHaveLOG()
-     * @see #getTLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isCanHaveLOG()
+     * @see #getLNClass()
      * @generated
      */
-    EAttribute getTLNClass_CanHaveLOG();
+    EAttribute getLNClass_CanHaveLOG();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isIsExtension <em>Is Extension</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isIsExtension <em>Is Extension</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Is Extension</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#isIsExtension()
-     * @see #getTLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#isIsExtension()
+     * @see #getLNClass()
      * @generated
      */
-    EAttribute getTLNClass_IsExtension();
+    EAttribute getLNClass_IsExtension();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass#getName()
-     * @see #getTLNClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass#getName()
+     * @see #getLNClass()
      * @generated
      */
-    EAttribute getTLNClass_Name();
+    EAttribute getLNClass_Name();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses <em>TLN Classes</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses <em>LN Classes</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TLN Classes</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses
+     * @return the meta object for class '<em>LN Classes</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses
      * @generated
      */
-    EClass getTLNClasses();
+    EClass getLNClasses();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses#getAbstractLNClass <em>Abstract LN Class</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses#getAbstractLNClass <em>Abstract LN Class</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Abstract LN Class</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses#getAbstractLNClass()
-     * @see #getTLNClasses()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses#getAbstractLNClass()
+     * @see #getLNClasses()
      * @generated
      */
-    EReference getTLNClasses_AbstractLNClass();
+    EReference getLNClasses_AbstractLNClass();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses#getLNClass <em>LN Class</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses#getLNClass <em>LN Class</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>LN Class</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses#getLNClass()
-     * @see #getTLNClasses()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses#getLNClass()
+     * @see #getLNClasses()
      * @generated
      */
-    EReference getTLNClasses_LNClass();
+    EReference getLNClasses_LNClass();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice <em>TNotice</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice <em>Notice</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TNotice</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice
+     * @return the meta object for class '<em>Notice</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice
      * @generated
      */
-    EClass getTNotice();
+    EClass getNotice();
 
     /**
-     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice#getMixed <em>Mixed</em>}'.
+     * Returns the meta object for the attribute list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice#getMixed <em>Mixed</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute list '<em>Mixed</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice#getMixed()
-     * @see #getTNotice()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice#getMixed()
+     * @see #getNotice()
      * @generated
      */
-    EAttribute getTNotice_Mixed();
+    EAttribute getNotice_Mixed();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS <em>TNS</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS <em>NS</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TNS</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS
+     * @return the meta object for class '<em>NS</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS
      * @generated
      */
-    EClass getTNS();
+    EClass getNS();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getChanges <em>Changes</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getChanges <em>Changes</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Changes</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getChanges()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getChanges()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_Changes();
+    EReference getNS_Changes();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getDependsOn <em>Depends On</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getDependsOn <em>Depends On</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Depends On</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getDependsOn()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getDependsOn()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_DependsOn();
+    EReference getNS_DependsOn();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getBasicTypes <em>Basic Types</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getBasicTypes <em>Basic Types</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Basic Types</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getBasicTypes()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getBasicTypes()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_BasicTypes();
+    EReference getNS_BasicTypes();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getFunctionalConstraints <em>Functional Constraints</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getFunctionalConstraints <em>Functional Constraints</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Functional Constraints</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getFunctionalConstraints()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getFunctionalConstraints()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_FunctionalConstraints();
+    EReference getNS_FunctionalConstraints();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPresenceConditions <em>Presence Conditions</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPresenceConditions <em>Presence Conditions</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Presence Conditions</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPresenceConditions()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPresenceConditions()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_PresenceConditions();
+    EReference getNS_PresenceConditions();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getAbbreviations <em>Abbreviations</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getAbbreviations <em>Abbreviations</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Abbreviations</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getAbbreviations()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getAbbreviations()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_Abbreviations();
+    EReference getNS_Abbreviations();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getEnumerations <em>Enumerations</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getEnumerations <em>Enumerations</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Enumerations</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getEnumerations()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getEnumerations()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_Enumerations();
+    EReference getNS_Enumerations();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getConstructedAttributes <em>Constructed Attributes</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getConstructedAttributes <em>Constructed Attributes</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Constructed Attributes</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getConstructedAttributes()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getConstructedAttributes()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_ConstructedAttributes();
+    EReference getNS_ConstructedAttributes();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getCDCs <em>CD Cs</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getCDCs <em>CD Cs</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>CD Cs</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getCDCs()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getCDCs()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_CDCs();
+    EReference getNS_CDCs();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getLNClasses <em>LN Classes</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getLNClasses <em>LN Classes</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>LN Classes</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getLNClasses()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getLNClasses()
+     * @see #getNS()
      * @generated
      */
-    EReference getTNS_LNClasses();
+    EReference getNS_LNClasses();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getDescID <em>Desc ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getDescID <em>Desc ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Desc ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getDescID()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getDescID()
+     * @see #getNS()
      * @generated
      */
-    EAttribute getTNS_DescID();
+    EAttribute getNS_DescID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getId <em>Id</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getId <em>Id</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Id</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getId()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getId()
+     * @see #getNS()
      * @generated
      */
-    EAttribute getTNS_Id();
+    EAttribute getNS_Id();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPublicationStage <em>Publication Stage</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPublicationStage <em>Publication Stage</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Publication Stage</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getPublicationStage()
-     * @see #getTNS()
-     * @generated
-     */
-    EAttribute getTNS_PublicationStage();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRelease <em>Release</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Release</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRelease()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getPublicationStage()
+     * @see #getNS()
      * @generated
      */
-    EAttribute getTNS_Release();
+    EAttribute getNS_PublicationStage();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRevision <em>Revision</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getRevision <em>Revision</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Revision</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getRevision()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getRevision()
+     * @see #getNS()
      * @generated
      */
-    EAttribute getTNS_Revision();
+    EAttribute getNS_Revision();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getUmlDate <em>Uml Date</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getUmlDate <em>Uml Date</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Uml Date</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getUmlDate()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getUmlDate()
+     * @see #getNS()
      * @generated
      */
-    EAttribute getTNS_UmlDate();
+    EAttribute getNS_UmlDate();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getUmlVersion <em>Uml Version</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getUmlVersion <em>Uml Version</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Uml Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getUmlVersion()
-     * @see #getTNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS#getUmlVersion()
+     * @see #getNS()
      * @generated
      */
-    EAttribute getTNS_UmlVersion();
+    EAttribute getNS_UmlVersion();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getVersion <em>Version</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc <em>NS Doc</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS#getVersion()
-     * @see #getTNS()
+     * @return the meta object for class '<em>NS Doc</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc
      * @generated
      */
-    EAttribute getTNS_Version();
+    EClass getNSDoc();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc <em>TNS Doc</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TNS Doc</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc
-     * @generated
-     */
-    EClass getTNSDoc();
-
-    /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getDoc <em>Doc</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getDoc <em>Doc</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Doc</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getDoc()
-     * @see #getTNSDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getDoc()
+     * @see #getNSDoc()
      * @generated
      */
-    EReference getTNSDoc_Doc();
+    EReference getNSDoc_Doc();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getId <em>Id</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getId <em>Id</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Id</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getId()
-     * @see #getTNSDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getId()
+     * @see #getNSDoc()
      * @generated
      */
-    EAttribute getTNSDoc_Id();
+    EAttribute getNSDoc_Id();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getLang <em>Lang</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getLang <em>Lang</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Lang</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getLang()
-     * @see #getTNSDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getLang()
+     * @see #getNSDoc()
      * @generated
      */
-    EAttribute getTNSDoc_Lang();
+    EAttribute getNSDoc_Lang();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getPublicationStage <em>Publication Stage</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getPublicationStage <em>Publication Stage</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Publication Stage</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getPublicationStage()
-     * @see #getTNSDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getPublicationStage()
+     * @see #getNSDoc()
      * @generated
      */
-    EAttribute getTNSDoc_PublicationStage();
+    EAttribute getNSDoc_PublicationStage();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRelease <em>Release</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Release</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRelease()
-     * @see #getTNSDoc()
-     * @generated
-     */
-    EAttribute getTNSDoc_Release();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRevision <em>Revision</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getRevision <em>Revision</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Revision</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getRevision()
-     * @see #getTNSDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getRevision()
+     * @see #getNSDoc()
      * @generated
      */
-    EAttribute getTNSDoc_Revision();
+    EAttribute getNSDoc_Revision();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getUmlDate <em>Uml Date</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getUmlDate <em>Uml Date</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Uml Date</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getUmlDate()
-     * @see #getTNSDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getUmlDate()
+     * @see #getNSDoc()
      * @generated
      */
-    EAttribute getTNSDoc_UmlDate();
+    EAttribute getNSDoc_UmlDate();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getUmlVersion <em>Uml Version</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getUmlVersion <em>Uml Version</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Uml Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getUmlVersion()
-     * @see #getTNSDoc()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc#getUmlVersion()
+     * @see #getNSDoc()
      * @generated
      */
-    EAttribute getTNSDoc_UmlVersion();
+    EAttribute getNSDoc_UmlVersion();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getVersion <em>Version</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition <em>Presence Condition</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc#getVersion()
-     * @see #getTNSDoc()
+     * @return the meta object for class '<em>Presence Condition</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition
      * @generated
      */
-    EAttribute getTNSDoc_Version();
+    EClass getPresenceCondition();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition <em>TPresence Condition</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TPresence Condition</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition
-     * @generated
-     */
-    EClass getTPresenceCondition();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getArgument <em>Argument</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getArgument <em>Argument</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Argument</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getArgument()
-     * @see #getTPresenceCondition()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getArgument()
+     * @see #getPresenceCondition()
      * @generated
      */
-    EAttribute getTPresenceCondition_Argument();
+    EAttribute getPresenceCondition_Argument();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getDescID <em>Desc ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getDescID <em>Desc ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Desc ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getDescID()
-     * @see #getTPresenceCondition()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getDescID()
+     * @see #getPresenceCondition()
      * @generated
      */
-    EAttribute getTPresenceCondition_DescID();
+    EAttribute getPresenceCondition_DescID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getName()
-     * @see #getTPresenceCondition()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getName()
+     * @see #getPresenceCondition()
      * @generated
      */
-    EAttribute getTPresenceCondition_Name();
+    EAttribute getPresenceCondition_Name();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getTitleID <em>Title ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getTitleID <em>Title ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Title ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getTitleID()
-     * @see #getTPresenceCondition()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getTitleID()
+     * @see #getPresenceCondition()
      * @generated
      */
-    EAttribute getTPresenceCondition_TitleID();
+    EAttribute getPresenceCondition_TitleID();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions <em>TPresence Conditions</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions <em>Presence Conditions</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TPresence Conditions</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions
+     * @return the meta object for class '<em>Presence Conditions</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions
      * @generated
      */
-    EClass getTPresenceConditions();
+    EClass getPresenceConditions();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions#getPresenceCondition <em>Presence Condition</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions#getPresenceCondition <em>Presence Condition</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Presence Condition</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions#getPresenceCondition()
-     * @see #getTPresenceConditions()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions#getPresenceCondition()
+     * @see #getPresenceConditions()
      * @generated
      */
-    EReference getTPresenceConditions_PresenceCondition();
+    EReference getPresenceConditions_PresenceCondition();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC <em>TService CDC</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC <em>Service CDC</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService CDC</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC
+     * @return the meta object for class '<em>Service CDC</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC
      * @generated
      */
-    EClass getTServiceCDC();
+    EClass getServiceCDC();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getServiceDataAttribute <em>Service Data Attribute</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getServiceDataAttribute <em>Service Data Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Service Data Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getServiceDataAttribute()
-     * @see #getTServiceCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getServiceDataAttribute()
+     * @see #getServiceCDC()
      * @generated
      */
-    EReference getTServiceCDC_ServiceDataAttribute();
+    EReference getServiceCDC_ServiceDataAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getCdc <em>Cdc</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getCdc <em>Cdc</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Cdc</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getCdc()
-     * @see #getTServiceCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getCdc()
+     * @see #getServiceCDC()
      * @generated
      */
-    EAttribute getTServiceCDC_Cdc();
+    EAttribute getServiceCDC_Cdc();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getVariant <em>Variant</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getVariant <em>Variant</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Variant</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getVariant()
-     * @see #getTServiceCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getVariant()
+     * @see #getServiceCDC()
      * @generated
      */
-    EAttribute getTServiceCDC_Variant();
+    EAttribute getServiceCDC_Variant();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs <em>TService CD Cs</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs <em>Service CD Cs</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService CD Cs</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs
+     * @return the meta object for class '<em>Service CD Cs</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs
      * @generated
      */
-    EClass getTServiceCDCs();
+    EClass getServiceCDCs();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs#getServiceCDC <em>Service CDC</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs#getServiceCDC <em>Service CDC</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Service CDC</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs#getServiceCDC()
-     * @see #getTServiceCDCs()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs#getServiceCDC()
+     * @see #getServiceCDCs()
      * @generated
      */
-    EReference getTServiceCDCs_ServiceCDC();
+    EReference getServiceCDCs_ServiceCDC();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute <em>TService Constructed Attribute</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute <em>Service Constructed Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService Constructed Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute
+     * @return the meta object for class '<em>Service Constructed Attribute</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute
      * @generated
      */
-    EClass getTServiceConstructedAttribute();
+    EClass getServiceConstructedAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type Kind Parameterized</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute#isTypeKindParameterized()
-     * @see #getTServiceConstructedAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute#isTypeKindParameterized()
+     * @see #getServiceConstructedAttribute()
      * @generated
      */
-    EAttribute getTServiceConstructedAttribute_TypeKindParameterized();
+    EAttribute getServiceConstructedAttribute_TypeKindParameterized();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes <em>TService Constructed Attributes</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes <em>Service Constructed Attributes</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService Constructed Attributes</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes
+     * @return the meta object for class '<em>Service Constructed Attributes</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes
      * @generated
      */
-    EClass getTServiceConstructedAttributes();
+    EClass getServiceConstructedAttributes();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes#getServiceConstructedAttribute <em>Service Constructed Attribute</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes#getServiceConstructedAttribute <em>Service Constructed Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Service Constructed Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes#getServiceConstructedAttribute()
-     * @see #getTServiceConstructedAttributes()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes#getServiceConstructedAttribute()
+     * @see #getServiceConstructedAttributes()
      * @generated
      */
-    EReference getTServiceConstructedAttributes_ServiceConstructedAttribute();
+    EReference getServiceConstructedAttributes_ServiceConstructedAttribute();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute <em>TService Data Attribute</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute <em>Service Data Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService Data Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute
+     * @return the meta object for class '<em>Service Data Attribute</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute
      * @generated
      */
-    EClass getTServiceDataAttribute();
+    EClass getServiceDataAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getFc <em>Fc</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getFc <em>Fc</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Fc</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getFc()
-     * @see #getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getFc()
+     * @see #getServiceDataAttribute()
      * @generated
      */
-    EAttribute getTServiceDataAttribute_Fc();
+    EAttribute getServiceDataAttribute_Fc();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getName()
-     * @see #getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getName()
+     * @see #getServiceDataAttribute()
      * @generated
      */
-    EAttribute getTServiceDataAttribute_Name();
+    EAttribute getServiceDataAttribute_Name();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCond <em>Pres Cond</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCond <em>Pres Cond</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCond()
-     * @see #getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCond()
+     * @see #getServiceDataAttribute()
      * @generated
      */
-    EAttribute getTServiceDataAttribute_PresCond();
+    EAttribute getServiceDataAttribute_PresCond();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCondArgs()
-     * @see #getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCondArgs()
+     * @see #getServiceDataAttribute()
      * @generated
      */
-    EAttribute getTServiceDataAttribute_PresCondArgs();
+    EAttribute getServiceDataAttribute_PresCondArgs();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCondArgsID()
-     * @see #getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCondArgsID()
+     * @see #getServiceDataAttribute()
      * @generated
      */
-    EAttribute getTServiceDataAttribute_PresCondArgsID();
+    EAttribute getServiceDataAttribute_PresCondArgsID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getType <em>Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getType <em>Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getType()
-     * @see #getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getType()
+     * @see #getServiceDataAttribute()
      * @generated
      */
-    EAttribute getTServiceDataAttribute_Type();
+    EAttribute getServiceDataAttribute_Type();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getTypeKind <em>Type Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getTypeKind <em>Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getTypeKind()
-     * @see #getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getTypeKind()
+     * @see #getServiceDataAttribute()
      * @generated
      */
-    EAttribute getTServiceDataAttribute_TypeKind();
+    EAttribute getServiceDataAttribute_TypeKind();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingType <em>Underlying Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingType <em>Underlying Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Underlying Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingType()
-     * @see #getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingType()
+     * @see #getServiceDataAttribute()
      * @generated
      */
-    EAttribute getTServiceDataAttribute_UnderlyingType();
+    EAttribute getServiceDataAttribute_UnderlyingType();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Underlying Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingTypeKind()
-     * @see #getTServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingTypeKind()
+     * @see #getServiceDataAttribute()
      * @generated
      */
-    EAttribute getTServiceDataAttribute_UnderlyingTypeKind();
+    EAttribute getServiceDataAttribute_UnderlyingTypeKind();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS <em>TService NS</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS <em>Service NS</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService NS</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS
+     * @return the meta object for class '<em>Service NS</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS
      * @generated
      */
-    EClass getTServiceNS();
+    EClass getServiceNS();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getChanges <em>Changes</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getChanges <em>Changes</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Changes</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getChanges()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getChanges()
+     * @see #getServiceNS()
      * @generated
      */
-    EReference getTServiceNS_Changes();
+    EReference getServiceNS_Changes();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getFunctionalConstraints <em>Functional Constraints</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getFunctionalConstraints <em>Functional Constraints</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Functional Constraints</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getFunctionalConstraints()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getFunctionalConstraints()
+     * @see #getServiceNS()
      * @generated
      */
-    EReference getTServiceNS_FunctionalConstraints();
+    EReference getServiceNS_FunctionalConstraints();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPresenceConditions <em>Presence Conditions</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPresenceConditions <em>Presence Conditions</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Presence Conditions</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPresenceConditions()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPresenceConditions()
+     * @see #getServiceNS()
      * @generated
      */
-    EReference getTServiceNS_PresenceConditions();
+    EReference getServiceNS_PresenceConditions();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getAbbreviations <em>Abbreviations</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getAbbreviations <em>Abbreviations</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Abbreviations</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getAbbreviations()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getAbbreviations()
+     * @see #getServiceNS()
      * @generated
      */
-    EReference getTServiceNS_Abbreviations();
+    EReference getServiceNS_Abbreviations();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceTypeRealizations <em>Service Type Realizations</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceTypeRealizations <em>Service Type Realizations</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Service Type Realizations</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceTypeRealizations()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceTypeRealizations()
+     * @see #getServiceNS()
      * @generated
      */
-    EReference getTServiceNS_ServiceTypeRealizations();
+    EReference getServiceNS_ServiceTypeRealizations();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceConstructedAttributes <em>Service Constructed Attributes</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceConstructedAttributes <em>Service Constructed Attributes</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Service Constructed Attributes</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceConstructedAttributes()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceConstructedAttributes()
+     * @see #getServiceNS()
      * @generated
      */
-    EReference getTServiceNS_ServiceConstructedAttributes();
+    EReference getServiceNS_ServiceConstructedAttributes();
 
     /**
-     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceCDCs <em>Service CD Cs</em>}'.
+     * Returns the meta object for the containment reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceCDCs <em>Service CD Cs</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Service CD Cs</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceCDCs()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceCDCs()
+     * @see #getServiceNS()
      * @generated
      */
-    EReference getTServiceNS_ServiceCDCs();
+    EReference getServiceNS_ServiceCDCs();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getDescID <em>Desc ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getDescID <em>Desc ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Desc ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getDescID()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getDescID()
+     * @see #getServiceNS()
      * @generated
      */
-    EAttribute getTServiceNS_DescID();
+    EAttribute getServiceNS_DescID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getId <em>Id</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getId <em>Id</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Id</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getId()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getId()
+     * @see #getServiceNS()
      * @generated
      */
-    EAttribute getTServiceNS_Id();
+    EAttribute getServiceNS_Id();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPublicationStage <em>Publication Stage</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPublicationStage <em>Publication Stage</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Publication Stage</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPublicationStage()
-     * @see #getTServiceNS()
-     * @generated
-     */
-    EAttribute getTServiceNS_PublicationStage();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRelease <em>Release</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Release</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRelease()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPublicationStage()
+     * @see #getServiceNS()
      * @generated
      */
-    EAttribute getTServiceNS_Release();
+    EAttribute getServiceNS_PublicationStage();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRevision <em>Revision</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getRevision <em>Revision</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Revision</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRevision()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getRevision()
+     * @see #getServiceNS()
      * @generated
      */
-    EAttribute getTServiceNS_Revision();
+    EAttribute getServiceNS_Revision();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getUmlDate <em>Uml Date</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getUmlDate <em>Uml Date</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Uml Date</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getUmlDate()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getUmlDate()
+     * @see #getServiceNS()
      * @generated
      */
-    EAttribute getTServiceNS_UmlDate();
+    EAttribute getServiceNS_UmlDate();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getUmlVersion <em>Uml Version</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getUmlVersion <em>Uml Version</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Uml Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getUmlVersion()
-     * @see #getTServiceNS()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getUmlVersion()
+     * @see #getServiceNS()
      * @generated
      */
-    EAttribute getTServiceNS_UmlVersion();
+    EAttribute getServiceNS_UmlVersion();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getVersion <em>Version</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage <em>Service Ns Usage</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getVersion()
-     * @see #getTServiceNS()
-     * @generated
-     */
-    EAttribute getTServiceNS_Version();
-
-    /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage <em>TService Ns Usage</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService Ns Usage</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage
+     * @return the meta object for class '<em>Service Ns Usage</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage
      * @generated
      */
-    EClass getTServiceNsUsage();
+    EClass getServiceNsUsage();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getAppliesTo <em>Applies To</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getAppliesTo <em>Applies To</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Applies To</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getAppliesTo()
-     * @see #getTServiceNsUsage()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getAppliesTo()
+     * @see #getServiceNsUsage()
      * @generated
      */
-    EReference getTServiceNsUsage_AppliesTo();
+    EReference getServiceNsUsage_AppliesTo();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getId <em>Id</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getId <em>Id</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Id</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getId()
-     * @see #getTServiceNsUsage()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getId()
+     * @see #getServiceNsUsage()
      * @generated
      */
-    EAttribute getTServiceNsUsage_Id();
+    EAttribute getServiceNsUsage_Id();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getPublicationStage <em>Publication Stage</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getPublicationStage <em>Publication Stage</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Publication Stage</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getPublicationStage()
-     * @see #getTServiceNsUsage()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getPublicationStage()
+     * @see #getServiceNsUsage()
      * @generated
      */
-    EAttribute getTServiceNsUsage_PublicationStage();
+    EAttribute getServiceNsUsage_PublicationStage();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRelease <em>Release</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Release</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRelease()
-     * @see #getTServiceNsUsage()
-     * @generated
-     */
-    EAttribute getTServiceNsUsage_Release();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRevision <em>Revision</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getRevision <em>Revision</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Revision</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRevision()
-     * @see #getTServiceNsUsage()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getRevision()
+     * @see #getServiceNsUsage()
      * @generated
      */
-    EAttribute getTServiceNsUsage_Revision();
+    EAttribute getServiceNsUsage_Revision();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getVersion <em>Version</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter <em>Service Parameter</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Version</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getVersion()
-     * @see #getTServiceNsUsage()
+     * @return the meta object for class '<em>Service Parameter</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter
      * @generated
      */
-    EAttribute getTServiceNsUsage_Version();
+    EClass getServiceParameter();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter <em>TService Parameter</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService Parameter</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter
-     * @generated
-     */
-    EClass getTServiceParameter();
-
-    /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getDefaultValue <em>Default Value</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getDefaultValue <em>Default Value</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Default Value</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getDefaultValue()
-     * @see #getTServiceParameter()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getDefaultValue()
+     * @see #getServiceParameter()
      * @generated
      */
-    EAttribute getTServiceParameter_DefaultValue();
+    EAttribute getServiceParameter_DefaultValue();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getMaxValue <em>Max Value</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getMaxValue <em>Max Value</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Max Value</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getMaxValue()
-     * @see #getTServiceParameter()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getMaxValue()
+     * @see #getServiceParameter()
      * @generated
      */
-    EAttribute getTServiceParameter_MaxValue();
+    EAttribute getServiceParameter_MaxValue();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getMinValue <em>Min Value</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getMinValue <em>Min Value</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Min Value</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getMinValue()
-     * @see #getTServiceParameter()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getMinValue()
+     * @see #getServiceParameter()
      * @generated
      */
-    EAttribute getTServiceParameter_MinValue();
+    EAttribute getServiceParameter_MinValue();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getName()
-     * @see #getTServiceParameter()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getName()
+     * @see #getServiceParameter()
      * @generated
      */
-    EAttribute getTServiceParameter_Name();
+    EAttribute getServiceParameter_Name();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getType <em>Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getType <em>Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getType()
-     * @see #getTServiceParameter()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getType()
+     * @see #getServiceParameter()
      * @generated
      */
-    EAttribute getTServiceParameter_Type();
+    EAttribute getServiceParameter_Type();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getTypeKind <em>Type Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getTypeKind <em>Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getTypeKind()
-     * @see #getTServiceParameter()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getTypeKind()
+     * @see #getServiceParameter()
      * @generated
      */
-    EAttribute getTServiceParameter_TypeKind();
+    EAttribute getServiceParameter_TypeKind();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization <em>TService Type Realization</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization <em>Service Type Realization</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService Type Realization</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization
+     * @return the meta object for class '<em>Service Type Realization</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization
      * @generated
      */
-    EClass getTServiceTypeRealization();
+    EClass getServiceTypeRealization();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getFc <em>Fc</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getFc <em>Fc</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Fc</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getFc()
-     * @see #getTServiceTypeRealization()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getFc()
+     * @see #getServiceTypeRealization()
      * @generated
      */
-    EAttribute getTServiceTypeRealization_Fc();
+    EAttribute getServiceTypeRealization_Fc();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getName()
-     * @see #getTServiceTypeRealization()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getName()
+     * @see #getServiceTypeRealization()
      * @generated
      */
-    EAttribute getTServiceTypeRealization_Name();
+    EAttribute getServiceTypeRealization_Name();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCond <em>Pres Cond</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCond <em>Pres Cond</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCond()
-     * @see #getTServiceTypeRealization()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCond()
+     * @see #getServiceTypeRealization()
      * @generated
      */
-    EAttribute getTServiceTypeRealization_PresCond();
+    EAttribute getServiceTypeRealization_PresCond();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCondArgs <em>Pres Cond Args</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCondArgs <em>Pres Cond Args</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCondArgs()
-     * @see #getTServiceTypeRealization()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCondArgs()
+     * @see #getServiceTypeRealization()
      * @generated
      */
-    EAttribute getTServiceTypeRealization_PresCondArgs();
+    EAttribute getServiceTypeRealization_PresCondArgs();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCondArgsID()
-     * @see #getTServiceTypeRealization()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCondArgsID()
+     * @see #getServiceTypeRealization()
      * @generated
      */
-    EAttribute getTServiceTypeRealization_PresCondArgsID();
+    EAttribute getServiceTypeRealization_PresCondArgsID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getType <em>Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getType <em>Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getType()
-     * @see #getTServiceTypeRealization()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getType()
+     * @see #getServiceTypeRealization()
      * @generated
      */
-    EAttribute getTServiceTypeRealization_Type();
+    EAttribute getServiceTypeRealization_Type();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getTypeKind <em>Type Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getTypeKind <em>Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getTypeKind()
-     * @see #getTServiceTypeRealization()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getTypeKind()
+     * @see #getServiceTypeRealization()
      * @generated
      */
-    EAttribute getTServiceTypeRealization_TypeKind();
+    EAttribute getServiceTypeRealization_TypeKind();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations <em>TService Type Realizations</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations <em>Service Type Realizations</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TService Type Realizations</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations
+     * @return the meta object for class '<em>Service Type Realizations</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations
      * @generated
      */
-    EClass getTServiceTypeRealizations();
+    EClass getServiceTypeRealizations();
 
     /**
-     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations#getServiceTypeRealization <em>Service Type Realization</em>}'.
+     * Returns the meta object for the containment reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations#getServiceTypeRealization <em>Service Type Realization</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Service Type Realization</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations#getServiceTypeRealization()
-     * @see #getTServiceTypeRealizations()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations#getServiceTypeRealization()
+     * @see #getServiceTypeRealizations()
      * @generated
      */
-    EReference getTServiceTypeRealizations_ServiceTypeRealization();
+    EReference getServiceTypeRealizations_ServiceTypeRealization();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute <em>TSub Data Attribute</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute <em>Sub Data Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TSub Data Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute
+     * @return the meta object for class '<em>Sub Data Attribute</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute
      * @generated
      */
-    EClass getTSubDataAttribute();
+    EClass getSubDataAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getDefaultValue <em>Default Value</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getDefaultValue <em>Default Value</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Default Value</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getDefaultValue()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getDefaultValue()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_DefaultValue();
+    EAttribute getSubDataAttribute_DefaultValue();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#isIsArray <em>Is Array</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#isIsArray <em>Is Array</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Is Array</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#isIsArray()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#isIsArray()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_IsArray();
+    EAttribute getSubDataAttribute_IsArray();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Max Index Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMaxIndexAttribute()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMaxIndexAttribute()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_MaxIndexAttribute();
+    EAttribute getSubDataAttribute_MaxIndexAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMaxValue <em>Max Value</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMaxValue <em>Max Value</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Max Value</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMaxValue()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMaxValue()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_MaxValue();
+    EAttribute getSubDataAttribute_MaxValue();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinIndex <em>Min Index</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinIndex <em>Min Index</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Min Index</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinIndex()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinIndex()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_MinIndex();
+    EAttribute getSubDataAttribute_MinIndex();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinValue <em>Min Value</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinValue <em>Min Value</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Min Value</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinValue()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinValue()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_MinValue();
+    EAttribute getSubDataAttribute_MinValue();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getName()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getName()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_Name();
+    EAttribute getSubDataAttribute_Name();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCond <em>Pres Cond</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCond <em>Pres Cond</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCond()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCond()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_PresCond();
+    EAttribute getSubDataAttribute_PresCond();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCondArgs()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCondArgs()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_PresCondArgs();
+    EAttribute getSubDataAttribute_PresCondArgs();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCondArgsID()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCondArgsID()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_PresCondArgsID();
+    EAttribute getSubDataAttribute_PresCondArgsID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getSizeAttribute <em>Size Attribute</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getSizeAttribute <em>Size Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Size Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getSizeAttribute()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getSizeAttribute()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_SizeAttribute();
+    EAttribute getSubDataAttribute_SizeAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getType <em>Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getType <em>Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getType()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getType()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_Type();
+    EAttribute getSubDataAttribute_Type();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getTypeKind <em>Type Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getTypeKind <em>Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getTypeKind()
-     * @see #getTSubDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getTypeKind()
+     * @see #getSubDataAttribute()
      * @generated
      */
-    EAttribute getTSubDataAttribute_TypeKind();
+    EAttribute getSubDataAttribute_TypeKind();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject <em>TSub Data Object</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject <em>Sub Data Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TSub Data Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject
+     * @return the meta object for class '<em>Sub Data Object</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject
      * @generated
      */
-    EClass getTSubDataObject();
+    EClass getSubDataObject();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#isIsArray <em>Is Array</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#isIsArray <em>Is Array</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Is Array</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#isIsArray()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#isIsArray()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_IsArray();
+    EAttribute getSubDataObject_IsArray();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMaxIndexAttribute <em>Max Index Attribute</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMaxIndexAttribute <em>Max Index Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Max Index Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMaxIndexAttribute()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMaxIndexAttribute()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_MaxIndexAttribute();
+    EAttribute getSubDataObject_MaxIndexAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMinIndex <em>Min Index</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMinIndex <em>Min Index</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Min Index</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMinIndex()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMinIndex()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_MinIndex();
+    EAttribute getSubDataObject_MinIndex();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getName <em>Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getName <em>Name</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getName()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getName()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_Name();
+    EAttribute getSubDataObject_Name();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCond <em>Pres Cond</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCond <em>Pres Cond</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCond()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCond()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_PresCond();
+    EAttribute getSubDataObject_PresCond();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCondArgs <em>Pres Cond Args</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCondArgs <em>Pres Cond Args</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCondArgs()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCondArgs()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_PresCondArgs();
+    EAttribute getSubDataObject_PresCondArgs();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Pres Cond Args ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCondArgsID()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCondArgsID()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_PresCondArgsID();
+    EAttribute getSubDataObject_PresCondArgsID();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getSizeAttribute <em>Size Attribute</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getSizeAttribute <em>Size Attribute</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Size Attribute</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getSizeAttribute()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getSizeAttribute()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_SizeAttribute();
+    EAttribute getSubDataObject_SizeAttribute();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getType <em>Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getType <em>Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getType()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getType()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_Type();
+    EAttribute getSubDataObject_Type();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingType <em>Underlying Type</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingType <em>Underlying Type</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Underlying Type</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingType()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingType()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_UnderlyingType();
+    EAttribute getSubDataObject_UnderlyingType();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Underlying Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingTypeKind()
-     * @see #getTSubDataObject()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingTypeKind()
+     * @see #getSubDataObject()
      * @generated
      */
-    EAttribute getTSubDataObject_UnderlyingTypeKind();
+    EAttribute getSubDataObject_UnderlyingTypeKind();
 
     /**
-     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass <em>TTitled Class</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass <em>Titled Class</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for class '<em>TTitled Class</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass
+     * @return the meta object for class '<em>Titled Class</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass
      * @generated
      */
-    EClass getTTitledClass();
+    EClass getTitledClass();
 
     /**
-     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass#getTitleID <em>Title ID</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass#getTitleID <em>Title ID</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Title ID</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass#getTitleID()
-     * @see #getTTitledClass()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass#getTitleID()
+     * @see #getTitledClass()
      * @generated
      */
-    EAttribute getTTitledClass_TitleID();
+    EAttribute getTitledClass_TitleID();
 
     /**
-     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind <em>TACSI Services Kind</em>}'.
+     * Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease <em>NSD Object With Version And Release</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>TACSI Services Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind
+     * @return the meta object for class '<em>NSD Object With Version And Release</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease
      * @generated
      */
-    EEnum getTACSIServicesKind();
+    EClass getNSDObjectWithVersionAndRelease();
 
     /**
-     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind <em>TCB Kind</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getRelease <em>Release</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>TCB Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind
-     * @generated
-     */
-    EEnum getTCBKind();
-
-    /**
-     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind <em>TDefined Attribute Type Kind</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>TDefined Attribute Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
-     * @generated
-     */
-    EEnum getTDefinedAttributeTypeKind();
-
-    /**
-     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind <em>TLicense Kind</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>TLicense Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind
-     * @generated
-     */
-    EEnum getTLicenseKind();
-
-    /**
-     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage <em>TPub Stage</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>TPub Stage</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
-     * @generated
-     */
-    EEnum getTPubStage();
-
-    /**
-     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind <em>TUndefined Attribute Type Kind</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>TUndefined Attribute Type Kind</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind
-     * @generated
-     */
-    EEnum getTUndefinedAttributeTypeKind();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TAbbreviation Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Name of an abbreviation.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TAbbreviation Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tAbbreviationName' baseType='http://www.eclipse.org/emf/2003/XMLType#normalizedString'"
-     * @generated
-     */
-    EDataType getTAbbreviationName();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TAbstract LN Class Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Name of an abstract logical node.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TAbstract LN Class Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tAbstractLNClassName' baseType='tIec61850Name'"
-     * @generated
-     */
-    EDataType getTAbstractLNClassName();
-
-    /**
-     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind <em>TACSI Services Kind Object</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TACSI Services Kind Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind
-     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind"
-     *        extendedMetaData="name='tACSIServicesKind:Object' baseType='tACSIServicesKind'"
-     * @generated
-     */
-    EDataType getTACSIServicesKindObject();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TAttribute Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Name of a Data Attribute.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TAttribute Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tAttributeName' baseType='tIec61850Name'"
-     * @generated
-     */
-    EDataType getTAttributeName();
-
-    /**
-     * Returns the meta object for data type '{@link org.eclipse.emf.common.util.Enumerator <em>TAttribute Type Kind</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Type kind of a data attribute, which may be "undefined".
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TAttribute Type Kind</em>'.
-     * @see org.eclipse.emf.common.util.Enumerator
-     * @model instanceClass="org.eclipse.emf.common.util.Enumerator"
-     *        extendedMetaData="name='tAttributeTypeKind' memberTypes='tDefinedAttributeTypeKind tUndefinedAttributeTypeKind'"
-     * @generated
-     */
-    EDataType getTAttributeTypeKind();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TBasic Type Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Type describing the name of a basic type of a data attribute.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TBasic Type Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tBasicTypeName' baseType='http://www.eclipse.org/emf/2003/XMLType#token' minLength='1'"
-     * @generated
-     */
-    EDataType getTBasicTypeName();
-
-    /**
-     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind <em>TCB Kind Object</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TCB Kind Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind
-     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind"
-     *        extendedMetaData="name='tCBKind:Object' baseType='tCBKind'"
-     * @generated
-     */
-    EDataType getTCBKindObject();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TCDC Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Name of a Common Data Class (CDC).
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TCDC Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tCDCName' baseType='tIec61850Name' minLength='1'"
-     * @generated
-     */
-    EDataType getTCDCName();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TData Object Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Name of a Data Object.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TData Object Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tDataObjectName' baseType='tIec61850Name' maxLength='12'"
-     * @generated
-     */
-    EDataType getTDataObjectName();
-
-    /**
-     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind <em>TDefined Attribute Type Kind Object</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TDefined Attribute Type Kind Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
-     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind"
-     *        extendedMetaData="name='tDefinedAttributeTypeKind:Object' baseType='tDefinedAttributeTypeKind'"
-     * @generated
-     */
-    EDataType getTDefinedAttributeTypeKindObject();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TDoc ID</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifier referring to a documentation string, available in a sibling file.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TDoc ID</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tDocID' baseType='http://www.eclipse.org/emf/2003/XMLType#normalizedString' minLength='1'"
-     * @generated
-     */
-    EDataType getTDocID();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TEmpty String</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * The empty string.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TEmpty String</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tEmptyString' baseType='http://www.eclipse.org/emf/2003/XMLType#normalizedString' maxLength='0'"
-     * @generated
-     */
-    EDataType getTEmptyString();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TFC Abbreviation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Functional Constraint abbreviation.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TFC Abbreviation</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tFCAbbreviation' baseType='http://www.eclipse.org/emf/2003/XMLType#token' minLength='1' pattern='[\\p{IsBasicLatin}]+'"
-     * @generated
-     */
-    EDataType getTFCAbbreviation();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TIec61850 Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TIec61850 Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tIec61850Name' baseType='http://www.eclipse.org/emf/2003/XMLType#Name' minLength='1' pattern='[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]+'"
-     * @generated
-     */
-    EDataType getTIec61850Name();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TIec61850 Name String</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TIec61850 Name String</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tIec61850NameString' baseType='http://www.eclipse.org/emf/2003/XMLType#normalizedString' pattern='[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]+'"
-     * @generated
-     */
-    EDataType getTIec61850NameString();
-
-    /**
-     * Returns the meta object for data type '{@link java.lang.String <em>Tissues Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>Tissues Type</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tissues_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#normalizedString' minLength='1'"
-     * @generated
-     */
-    EDataType getTissuesType();
-
-    /**
-     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind <em>TLicense Kind Object</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TLicense Kind Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind
-     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind"
-     *        extendedMetaData="name='tLicenseKind:Object' baseType='tLicenseKind'"
+     * @return the meta object for the attribute '<em>Release</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getRelease()
+     * @see #getNSDObjectWithVersionAndRelease()
      * @generated
      */
-    EDataType getTLicenseKindObject();
+    EAttribute getNSDObjectWithVersionAndRelease_Release();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TLiteral Name</em>}'.
+     * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getVersion <em>Version</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Name of an enumeration literal. Maybe the empty string.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TLiteral Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tLiteralName' baseType='http://www.eclipse.org/emf/2003/XMLType#normalizedString' maxLength='127' pattern='[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]*'"
+     * @return the meta object for the attribute '<em>Version</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease#getVersion()
+     * @see #getNSDObjectWithVersionAndRelease()
      * @generated
      */
-    EDataType getTLiteralName();
+    EAttribute getNSDObjectWithVersionAndRelease_Version();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TLN Class Name</em>}'.
+     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind <em>ACSI Services Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Name of a (non-abstract) logical node class.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TLN Class Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tLNClassName' baseType='http://www.eclipse.org/emf/2003/XMLType#Name' pattern='LLN0 [A-Z]{4}'"
+     * @return the meta object for enum '<em>ACSI Services Kind</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind
      * @generated
      */
-    EDataType getTLNClassName();
+    EEnum getACSIServicesKind();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TNS Identifier</em>}'.
+     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind <em>CB Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifier of a namespace.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TNS Identifier</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tNSIdentifier' baseType='http://www.eclipse.org/emf/2003/XMLType#normalizedString' pattern='\\p{IsBasicLatin}+'"
+     * @return the meta object for enum '<em>CB Kind</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind
      * @generated
      */
-    EDataType getTNSIdentifier();
+    EEnum getCBKind();
 
     /**
-     * Returns the meta object for data type '<em>TNS Release</em>'.
+     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind <em>Defined Attribute Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Release of a namespace (number between 1 and 255), distinguishing between releases of a same namespace version and revision.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TNS Release</em>'.
-     * @model instanceClass="short"
-     *        extendedMetaData="name='tNSRelease' baseType='http://www.eclipse.org/emf/2003/XMLType#unsignedByte' minExclusive='0'"
+     * @return the meta object for enum '<em>Defined Attribute Type Kind</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
      * @generated
      */
-    EDataType getTNSRelease();
+    EEnum getDefinedAttributeTypeKind();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.Short <em>TNS Release Object</em>}'.
+     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind <em>License Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TNS Release Object</em>'.
-     * @see java.lang.Short
-     * @model instanceClass="java.lang.Short"
-     *        extendedMetaData="name='tNSRelease:Object' baseType='tNSRelease'"
+     * @return the meta object for enum '<em>License Kind</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind
      * @generated
      */
-    EDataType getTNSReleaseObject();
+    EEnum getLicenseKind();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TNS Revision</em>}'.
+     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage <em>Pub Stage</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Revision of a namespace (a basic latin upper-case letter), distinguishing between revisions of a same namespace version.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TNS Revision</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tNSRevision' baseType='http://www.eclipse.org/emf/2003/XMLType#token' pattern='[A-Z]'"
+     * @return the meta object for enum '<em>Pub Stage</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @generated
      */
-    EDataType getTNSRevision();
+    EEnum getPubStage();
 
     /**
-     * Returns the meta object for data type '<em>TNS Version</em>'.
+     * Returns the meta object for enum '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind <em>Undefined Attribute Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Version of a namespace (a year between 2002 and 2099).
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TNS Version</em>'.
-     * @model instanceClass="int"
-     *        extendedMetaData="name='tNSVersion' baseType='http://www.eclipse.org/emf/2003/XMLType#unsignedShort' minInclusive='2002' maxInclusive='2099'"
+     * @return the meta object for enum '<em>Undefined Attribute Type Kind</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind
      * @generated
      */
-    EDataType getTNSVersion();
+    EEnum getUndefinedAttributeTypeKind();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.Integer <em>TNS Version Object</em>}'.
+     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind <em>ACSI Services Kind Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TNS Version Object</em>'.
-     * @see java.lang.Integer
-     * @model instanceClass="java.lang.Integer"
-     *        extendedMetaData="name='tNSVersion:Object' baseType='tNSVersion'"
+     * @return the meta object for data type '<em>ACSI Services Kind Object</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind
+     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind"
+     *        extendedMetaData="name='tACSIServicesKind:Object' baseType='tACSIServicesKind'"
      * @generated
      */
-    EDataType getTNSVersionObject();
+    EDataType getACSIServicesKindObject();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TPresence Condition Argument</em>}'.
+     * Returns the meta object for data type '{@link org.eclipse.emf.common.util.Enumerator <em>Attribute Type Kind</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
-     * Argument to (some) presence conditions.
+     * Type kind of a data attribute, which may be "undefined".
      * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TPresence Condition Argument</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tPresenceConditionArgument' baseType='http://www.eclipse.org/emf/2003/XMLType#normalizedString'"
+     * @return the meta object for data type '<em>Attribute Type Kind</em>'.
+     * @see org.eclipse.emf.common.util.Enumerator
+     * @model instanceClass="org.eclipse.emf.common.util.Enumerator"
+     *        extendedMetaData="name='tAttributeTypeKind' memberTypes='tDefinedAttributeTypeKind tUndefinedAttributeTypeKind'"
      * @generated
      */
-    EDataType getTPresenceConditionArgument();
+    EDataType getAttributeTypeKind();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TPresence Condition Name</em>}'.
+     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind <em>CB Kind Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Name of a presence condition of a child.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TPresence Condition Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tPresenceConditionName' baseType='http://www.eclipse.org/emf/2003/XMLType#normalizedString'"
+     * @return the meta object for data type '<em>CB Kind Object</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind
+     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind"
+     *        extendedMetaData="name='tCBKind:Object' baseType='tCBKind'"
      * @generated
      */
-    EDataType getTPresenceConditionName();
+    EDataType getCBKindObject();
 
     /**
-     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage <em>TPub Stage Object</em>}'.
+     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind <em>Defined Attribute Type Kind Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TPub Stage Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
-     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage"
-     *        extendedMetaData="name='tPubStage:Object' baseType='tPubStage'"
+     * @return the meta object for data type '<em>Defined Attribute Type Kind Object</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
+     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind"
+     *        extendedMetaData="name='tDefinedAttributeTypeKind:Object' baseType='tDefinedAttributeTypeKind'"
      * @generated
      */
-    EDataType getTPubStageObject();
+    EDataType getDefinedAttributeTypeKindObject();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TSub Data Object Name</em>}'.
+     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind <em>License Kind Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Name of a Sub-Data Object.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TSub Data Object Name</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tSubDataObjectName' baseType='tIec61850Name'"
+     * @return the meta object for data type '<em>License Kind Object</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind
+     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind"
+     *        extendedMetaData="name='tLicenseKind:Object' baseType='tLicenseKind'"
      * @generated
      */
-    EDataType getTSubDataObjectName();
+    EDataType getLicenseKindObject();
 
     /**
-     * Returns the meta object for data type '{@link java.lang.String <em>TUML Version</em>}'.
+     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage <em>Pub Stage Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Version of the UML model used to generate this NSD.
-     * <!-- end-model-doc -->
-     * @return the meta object for data type '<em>TUML Version</em>'.
-     * @see java.lang.String
-     * @model instanceClass="java.lang.String"
-     *        extendedMetaData="name='tUMLVersion' baseType='http://www.eclipse.org/emf/2003/XMLType#Name' minLength='1'"
+     * @return the meta object for data type '<em>Pub Stage Object</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
+     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage"
+     *        extendedMetaData="name='tPubStage:Object' baseType='tPubStage'"
      * @generated
      */
-    EDataType getTUMLVersion();
+    EDataType getPubStageObject();
 
     /**
-     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind <em>TUndefined Attribute Type Kind Object</em>}'.
+     * Returns the meta object for data type '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind <em>Undefined Attribute Type Kind Object</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>TUndefined Attribute Type Kind Object</em>'.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind
-     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind"
+     * @return the meta object for data type '<em>Undefined Attribute Type Kind Object</em>'.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind
+     * @model instanceClass="fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind"
      *        extendedMetaData="name='tUndefinedAttributeTypeKind:Object' baseType='tUndefinedAttributeTypeKind'"
      * @generated
      */
-    EDataType getTUndefinedAttributeTypeKindObject();
+    EDataType getUndefinedAttributeTypeKindObject();
 
     /**
      * Returns the factory that creates the instances of the model.
@@ -7783,14 +7126,6 @@ public interface NsdPackage extends EPackage {
          */
         EAttribute APPLIES_TO_TYPE__PUBLICATION_STAGE = eINSTANCE.getAppliesToType_PublicationStage();
 
-        /**
-         * The meta object literal for the '<em><b>Release</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute APPLIES_TO_TYPE__RELEASE = eINSTANCE.getAppliesToType_Release();
-
         /**
          * The meta object literal for the '<em><b>Revision</b></em>' attribute feature.
          * <!-- begin-user-doc -->
@@ -7799,14 +7134,6 @@ public interface NsdPackage extends EPackage {
          */
         EAttribute APPLIES_TO_TYPE__REVISION = eINSTANCE.getAppliesToType_Revision();
 
-        /**
-         * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute APPLIES_TO_TYPE__VERSION = eINSTANCE.getAppliesToType_Version();
-
         /**
          * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DependsOnTypeImpl <em>Depends On Type</em>}' class.
          * <!-- begin-user-doc -->
@@ -7833,14 +7160,6 @@ public interface NsdPackage extends EPackage {
          */
         EAttribute DEPENDS_ON_TYPE__PUBLICATION_STAGE = eINSTANCE.getDependsOnType_PublicationStage();
 
-        /**
-         * The meta object literal for the '<em><b>Release</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute DEPENDS_ON_TYPE__RELEASE = eINSTANCE.getDependsOnType_Release();
-
         /**
          * The meta object literal for the '<em><b>Revision</b></em>' attribute feature.
          * <!-- begin-user-doc -->
@@ -7849,14 +7168,6 @@ public interface NsdPackage extends EPackage {
          */
         EAttribute DEPENDS_ON_TYPE__REVISION = eINSTANCE.getDependsOnType_Revision();
 
-        /**
-         * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute DEPENDS_ON_TYPE__VERSION = eINSTANCE.getDependsOnType_Version();
-
         /**
          * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocumentRootImpl <em>Document Root</em>}' class.
          * <!-- begin-user-doc -->
@@ -7950,14 +7261,14 @@ public interface NsdPackage extends EPackage {
         EAttribute SERVICE_TYPE__NAME = eINSTANCE.getServiceType_Name();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationImpl <em>TAbbreviation</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationImpl <em>Abbreviation</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbbreviation()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAbbreviation()
          * @generated
          */
-        EClass TABBREVIATION = eINSTANCE.getTAbbreviation();
+        EClass ABBREVIATION = eINSTANCE.getAbbreviation();
 
         /**
          * The meta object literal for the '<em><b>Desc ID</b></em>' attribute feature.
@@ -7965,7 +7276,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TABBREVIATION__DESC_ID = eINSTANCE.getTAbbreviation_DescID();
+        EAttribute ABBREVIATION__DESC_ID = eINSTANCE.getAbbreviation_DescID();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -7973,17 +7284,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TABBREVIATION__NAME = eINSTANCE.getTAbbreviation_Name();
+        EAttribute ABBREVIATION__NAME = eINSTANCE.getAbbreviation_Name();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationsImpl <em>TAbbreviations</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationsImpl <em>Abbreviations</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationsImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbbreviations()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationsImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAbbreviations()
          * @generated
          */
-        EClass TABBREVIATIONS = eINSTANCE.getTAbbreviations();
+        EClass ABBREVIATIONS = eINSTANCE.getAbbreviations();
 
         /**
          * The meta object literal for the '<em><b>Abbreviation</b></em>' containment reference list feature.
@@ -7991,17 +7302,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TABBREVIATIONS__ABBREVIATION = eINSTANCE.getTAbbreviations_Abbreviation();
+        EReference ABBREVIATIONS__ABBREVIATION = eINSTANCE.getAbbreviations_Abbreviation();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbstractLNClassImpl <em>TAbstract LN Class</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbstractLNClassImpl <em>Abstract LN Class</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbstractLNClassImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbstractLNClass()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbstractLNClassImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAbstractLNClass()
          * @generated
          */
-        EClass TABSTRACT_LN_CLASS = eINSTANCE.getTAbstractLNClass();
+        EClass ABSTRACT_LN_CLASS = eINSTANCE.getAbstractLNClass();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -8009,17 +7320,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TABSTRACT_LN_CLASS__NAME = eINSTANCE.getTAbstractLNClass_Name();
+        EAttribute ABSTRACT_LN_CLASS__NAME = eINSTANCE.getAbstractLNClass_Name();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAnyLNClassImpl <em>TAny LN Class</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AnyLNClassImpl <em>Any LN Class</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAnyLNClassImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAnyLNClass()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AnyLNClassImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAnyLNClass()
          * @generated
          */
-        EClass TANY_LN_CLASS = eINSTANCE.getTAnyLNClass();
+        EClass ANY_LN_CLASS = eINSTANCE.getAnyLNClass();
 
         /**
          * The meta object literal for the '<em><b>Data Object</b></em>' containment reference list feature.
@@ -8027,7 +7338,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TANY_LN_CLASS__DATA_OBJECT = eINSTANCE.getTAnyLNClass_DataObject();
+        EReference ANY_LN_CLASS__DATA_OBJECT = eINSTANCE.getAnyLNClass_DataObject();
 
         /**
          * The meta object literal for the '<em><b>Base</b></em>' attribute feature.
@@ -8035,17 +7346,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TANY_LN_CLASS__BASE = eINSTANCE.getTAnyLNClass_Base();
+        EAttribute ANY_LN_CLASS__BASE = eINSTANCE.getAnyLNClass_Base();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServiceNSImpl <em>TApplicable Service NS</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServiceNSImpl <em>Applicable Service NS</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServiceNSImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTApplicableServiceNS()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServiceNSImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getApplicableServiceNS()
          * @generated
          */
-        EClass TAPPLICABLE_SERVICE_NS = eINSTANCE.getTApplicableServiceNS();
+        EClass APPLICABLE_SERVICE_NS = eINSTANCE.getApplicableServiceNS();
 
         /**
          * The meta object literal for the '<em><b>Service Ns Usage</b></em>' containment reference list feature.
@@ -8053,7 +7364,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE = eINSTANCE.getTApplicableServiceNS_ServiceNsUsage();
+        EReference APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE = eINSTANCE.getApplicableServiceNS_ServiceNsUsage();
 
         /**
          * The meta object literal for the '<em><b>Date</b></em>' attribute feature.
@@ -8061,7 +7372,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TAPPLICABLE_SERVICE_NS__DATE = eINSTANCE.getTApplicableServiceNS_Date();
+        EAttribute APPLICABLE_SERVICE_NS__DATE = eINSTANCE.getApplicableServiceNS_Date();
 
         /**
          * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
@@ -8069,17 +7380,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TAPPLICABLE_SERVICE_NS__VERSION = eINSTANCE.getTApplicableServiceNS_Version();
+        EAttribute APPLICABLE_SERVICE_NS__VERSION = eINSTANCE.getApplicableServiceNS_Version();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServicesImpl <em>TApplicable Services</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServicesImpl <em>Applicable Services</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServicesImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTApplicableServices()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServicesImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getApplicableServices()
          * @generated
          */
-        EClass TAPPLICABLE_SERVICES = eINSTANCE.getTApplicableServices();
+        EClass APPLICABLE_SERVICES = eINSTANCE.getApplicableServices();
 
         /**
          * The meta object literal for the '<em><b>Service</b></em>' containment reference list feature.
@@ -8087,7 +7398,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TAPPLICABLE_SERVICES__SERVICE = eINSTANCE.getTApplicableServices_Service();
+        EReference APPLICABLE_SERVICES__SERVICE = eINSTANCE.getApplicableServices_Service();
 
         /**
          * The meta object literal for the '<em><b>Data Set Member Of</b></em>' containment reference list feature.
@@ -8095,17 +7406,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF = eINSTANCE.getTApplicableServices_DataSetMemberOf();
+        EReference APPLICABLE_SERVICES__DATA_SET_MEMBER_OF = eINSTANCE.getApplicableServices_DataSetMemberOf();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypeImpl <em>TBasic Type</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypeImpl <em>Basic Type</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypeImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTBasicType()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypeImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getBasicType()
          * @generated
          */
-        EClass TBASIC_TYPE = eINSTANCE.getTBasicType();
+        EClass BASIC_TYPE = eINSTANCE.getBasicType();
 
         /**
          * The meta object literal for the '<em><b>Desc ID</b></em>' attribute feature.
@@ -8113,7 +7424,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TBASIC_TYPE__DESC_ID = eINSTANCE.getTBasicType_DescID();
+        EAttribute BASIC_TYPE__DESC_ID = eINSTANCE.getBasicType_DescID();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -8121,17 +7432,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TBASIC_TYPE__NAME = eINSTANCE.getTBasicType_Name();
+        EAttribute BASIC_TYPE__NAME = eINSTANCE.getBasicType_Name();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypesImpl <em>TBasic Types</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypesImpl <em>Basic Types</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypesImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTBasicTypes()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypesImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getBasicTypes()
          * @generated
          */
-        EClass TBASIC_TYPES = eINSTANCE.getTBasicTypes();
+        EClass BASIC_TYPES = eINSTANCE.getBasicTypes();
 
         /**
          * The meta object literal for the '<em><b>Basic Type</b></em>' containment reference list feature.
@@ -8139,17 +7450,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TBASIC_TYPES__BASIC_TYPE = eINSTANCE.getTBasicTypes_BasicType();
+        EReference BASIC_TYPES__BASIC_TYPE = eINSTANCE.getBasicTypes_BasicType();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl <em>TCDC</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl <em>CDC</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCDC()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCDC()
          * @generated
          */
-        EClass TCDC = eINSTANCE.getTCDC();
+        EClass CDC = eINSTANCE.getCDC();
 
         /**
          * The meta object literal for the '<em><b>Sub Data Object</b></em>' containment reference list feature.
@@ -8157,7 +7468,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TCDC__SUB_DATA_OBJECT = eINSTANCE.getTCDC_SubDataObject();
+        EReference CDC__SUB_DATA_OBJECT = eINSTANCE.getCDC_SubDataObject();
 
         /**
          * The meta object literal for the '<em><b>Data Attribute</b></em>' containment reference list feature.
@@ -8165,7 +7476,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TCDC__DATA_ATTRIBUTE = eINSTANCE.getTCDC_DataAttribute();
+        EReference CDC__DATA_ATTRIBUTE = eINSTANCE.getCDC_DataAttribute();
 
         /**
          * The meta object literal for the '<em><b>Service Parameter</b></em>' containment reference feature.
@@ -8173,7 +7484,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TCDC__SERVICE_PARAMETER = eINSTANCE.getTCDC_ServiceParameter();
+        EReference CDC__SERVICE_PARAMETER = eINSTANCE.getCDC_ServiceParameter();
 
         /**
          * The meta object literal for the '<em><b>Enum Parameterized</b></em>' attribute feature.
@@ -8181,7 +7492,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCDC__ENUM_PARAMETERIZED = eINSTANCE.getTCDC_EnumParameterized();
+        EAttribute CDC__ENUM_PARAMETERIZED = eINSTANCE.getCDC_EnumParameterized();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -8189,7 +7500,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCDC__NAME = eINSTANCE.getTCDC_Name();
+        EAttribute CDC__NAME = eINSTANCE.getCDC_Name();
 
         /**
          * The meta object literal for the '<em><b>Statistics</b></em>' attribute feature.
@@ -8197,7 +7508,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCDC__STATISTICS = eINSTANCE.getTCDC_Statistics();
+        EAttribute CDC__STATISTICS = eINSTANCE.getCDC_Statistics();
 
         /**
          * The meta object literal for the '<em><b>Type Kind Parameterized</b></em>' attribute feature.
@@ -8205,7 +7516,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCDC__TYPE_KIND_PARAMETERIZED = eINSTANCE.getTCDC_TypeKindParameterized();
+        EAttribute CDC__TYPE_KIND_PARAMETERIZED = eINSTANCE.getCDC_TypeKindParameterized();
 
         /**
          * The meta object literal for the '<em><b>Variant</b></em>' attribute feature.
@@ -8213,17 +7524,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCDC__VARIANT = eINSTANCE.getTCDC_Variant();
+        EAttribute CDC__VARIANT = eINSTANCE.getCDC_Variant();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCsImpl <em>TCD Cs</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCsImpl <em>CD Cs</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCsImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCDCs()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCsImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCDCs()
          * @generated
          */
-        EClass TCD_CS = eINSTANCE.getTCDCs();
+        EClass CD_CS = eINSTANCE.getCDCs();
 
         /**
          * The meta object literal for the '<em><b>CDC</b></em>' containment reference list feature.
@@ -8231,17 +7542,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TCD_CS__CDC = eINSTANCE.getTCDCs_CDC();
+        EReference CD_CS__CDC = eINSTANCE.getCDCs_CDC();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl <em>TChanges</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ChangesImpl <em>Changes</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTChanges()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ChangesImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getChanges()
          * @generated
          */
-        EClass TCHANGES = eINSTANCE.getTChanges();
+        EClass CHANGES = eINSTANCE.getChanges();
 
         /**
          * The meta object literal for the '<em><b>Changes ID</b></em>' attribute feature.
@@ -8249,7 +7560,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCHANGES__CHANGES_ID = eINSTANCE.getTChanges_ChangesID();
+        EAttribute CHANGES__CHANGES_ID = eINSTANCE.getChanges_ChangesID();
 
         /**
          * The meta object literal for the '<em><b>Date</b></em>' attribute feature.
@@ -8257,15 +7568,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCHANGES__DATE = eINSTANCE.getTChanges_Date();
-
-        /**
-         * The meta object literal for the '<em><b>Release</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TCHANGES__RELEASE = eINSTANCE.getTChanges_Release();
+        EAttribute CHANGES__DATE = eINSTANCE.getChanges_Date();
 
         /**
          * The meta object literal for the '<em><b>Revision</b></em>' attribute feature.
@@ -8273,7 +7576,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCHANGES__REVISION = eINSTANCE.getTChanges_Revision();
+        EAttribute CHANGES__REVISION = eINSTANCE.getChanges_Revision();
 
         /**
          * The meta object literal for the '<em><b>Tissues</b></em>' attribute feature.
@@ -8281,25 +7584,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCHANGES__TISSUES = eINSTANCE.getTChanges_Tissues();
-
-        /**
-         * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TCHANGES__VERSION = eINSTANCE.getTChanges_Version();
+        EAttribute CHANGES__TISSUES = eINSTANCE.getChanges_Tissues();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributeImpl <em>TConstructed Attribute</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributeImpl <em>Constructed Attribute</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributeImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTConstructedAttribute()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributeImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getConstructedAttribute()
          * @generated
          */
-        EClass TCONSTRUCTED_ATTRIBUTE = eINSTANCE.getTConstructedAttribute();
+        EClass CONSTRUCTED_ATTRIBUTE = eINSTANCE.getConstructedAttribute();
 
         /**
          * The meta object literal for the '<em><b>Sub Data Attribute</b></em>' containment reference list feature.
@@ -8307,7 +7602,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE = eINSTANCE.getTConstructedAttribute_SubDataAttribute();
+        EReference CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE = eINSTANCE.getConstructedAttribute_SubDataAttribute();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -8315,17 +7610,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TCONSTRUCTED_ATTRIBUTE__NAME = eINSTANCE.getTConstructedAttribute_Name();
+        EAttribute CONSTRUCTED_ATTRIBUTE__NAME = eINSTANCE.getConstructedAttribute_Name();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributesImpl <em>TConstructed Attributes</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributesImpl <em>Constructed Attributes</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributesImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTConstructedAttributes()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributesImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getConstructedAttributes()
          * @generated
          */
-        EClass TCONSTRUCTED_ATTRIBUTES = eINSTANCE.getTConstructedAttributes();
+        EClass CONSTRUCTED_ATTRIBUTES = eINSTANCE.getConstructedAttributes();
 
         /**
          * The meta object literal for the '<em><b>Constructed Attribute</b></em>' containment reference list feature.
@@ -8333,18 +7628,18 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE = eINSTANCE
-                .getTConstructedAttributes_ConstructedAttribute();
+        EReference CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE = eINSTANCE
+                .getConstructedAttributes_ConstructedAttribute();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightedImpl <em>TCopyrighted</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightedImpl <em>Copyrighted</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightedImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCopyrighted()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightedImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCopyrighted()
          * @generated
          */
-        EClass TCOPYRIGHTED = eINSTANCE.getTCopyrighted();
+        EClass COPYRIGHTED = eINSTANCE.getCopyrighted();
 
         /**
          * The meta object literal for the '<em><b>Copyright</b></em>' containment reference feature.
@@ -8352,17 +7647,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TCOPYRIGHTED__COPYRIGHT = eINSTANCE.getTCopyrighted_Copyright();
+        EReference COPYRIGHTED__COPYRIGHT = eINSTANCE.getCopyrighted_Copyright();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightNoticeImpl <em>TCopyright Notice</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightNoticeImpl <em>Copyright Notice</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightNoticeImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCopyrightNotice()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightNoticeImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCopyrightNotice()
          * @generated
          */
-        EClass TCOPYRIGHT_NOTICE = eINSTANCE.getTCopyrightNotice();
+        EClass COPYRIGHT_NOTICE = eINSTANCE.getCopyrightNotice();
 
         /**
          * The meta object literal for the '<em><b>Notice</b></em>' containment reference feature.
@@ -8370,7 +7665,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TCOPYRIGHT_NOTICE__NOTICE = eINSTANCE.getTCopyrightNotice_Notice();
+        EReference COPYRIGHT_NOTICE__NOTICE = eINSTANCE.getCopyrightNotice_Notice();
 
         /**
          * The meta object literal for the '<em><b>License</b></em>' containment reference feature.
@@ -8378,17 +7673,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TCOPYRIGHT_NOTICE__LICENSE = eINSTANCE.getTCopyrightNotice_License();
+        EReference COPYRIGHT_NOTICE__LICENSE = eINSTANCE.getCopyrightNotice_License();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl <em>TData Attribute</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl <em>Data Attribute</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDataAttribute()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDataAttribute()
          * @generated
          */
-        EClass TDATA_ATTRIBUTE = eINSTANCE.getTDataAttribute();
+        EClass DATA_ATTRIBUTE = eINSTANCE.getDataAttribute();
 
         /**
          * The meta object literal for the '<em><b>Dchg</b></em>' attribute feature.
@@ -8396,7 +7691,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__DCHG = eINSTANCE.getTDataAttribute_Dchg();
+        EAttribute DATA_ATTRIBUTE__DCHG = eINSTANCE.getDataAttribute_Dchg();
 
         /**
          * The meta object literal for the '<em><b>Default Value</b></em>' attribute feature.
@@ -8404,7 +7699,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__DEFAULT_VALUE = eINSTANCE.getTDataAttribute_DefaultValue();
+        EAttribute DATA_ATTRIBUTE__DEFAULT_VALUE = eINSTANCE.getDataAttribute_DefaultValue();
 
         /**
          * The meta object literal for the '<em><b>Dupd</b></em>' attribute feature.
@@ -8412,7 +7707,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__DUPD = eINSTANCE.getTDataAttribute_Dupd();
+        EAttribute DATA_ATTRIBUTE__DUPD = eINSTANCE.getDataAttribute_Dupd();
 
         /**
          * The meta object literal for the '<em><b>Fc</b></em>' attribute feature.
@@ -8420,7 +7715,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__FC = eINSTANCE.getTDataAttribute_Fc();
+        EAttribute DATA_ATTRIBUTE__FC = eINSTANCE.getDataAttribute_Fc();
 
         /**
          * The meta object literal for the '<em><b>Is Array</b></em>' attribute feature.
@@ -8428,7 +7723,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__IS_ARRAY = eINSTANCE.getTDataAttribute_IsArray();
+        EAttribute DATA_ATTRIBUTE__IS_ARRAY = eINSTANCE.getDataAttribute_IsArray();
 
         /**
          * The meta object literal for the '<em><b>Max Index Attribute</b></em>' attribute feature.
@@ -8436,7 +7731,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE = eINSTANCE.getTDataAttribute_MaxIndexAttribute();
+        EAttribute DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE = eINSTANCE.getDataAttribute_MaxIndexAttribute();
 
         /**
          * The meta object literal for the '<em><b>Max Value</b></em>' attribute feature.
@@ -8444,7 +7739,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__MAX_VALUE = eINSTANCE.getTDataAttribute_MaxValue();
+        EAttribute DATA_ATTRIBUTE__MAX_VALUE = eINSTANCE.getDataAttribute_MaxValue();
 
         /**
          * The meta object literal for the '<em><b>Min Index</b></em>' attribute feature.
@@ -8452,7 +7747,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__MIN_INDEX = eINSTANCE.getTDataAttribute_MinIndex();
+        EAttribute DATA_ATTRIBUTE__MIN_INDEX = eINSTANCE.getDataAttribute_MinIndex();
 
         /**
          * The meta object literal for the '<em><b>Min Value</b></em>' attribute feature.
@@ -8460,7 +7755,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__MIN_VALUE = eINSTANCE.getTDataAttribute_MinValue();
+        EAttribute DATA_ATTRIBUTE__MIN_VALUE = eINSTANCE.getDataAttribute_MinValue();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -8468,7 +7763,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__NAME = eINSTANCE.getTDataAttribute_Name();
+        EAttribute DATA_ATTRIBUTE__NAME = eINSTANCE.getDataAttribute_Name();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond</b></em>' attribute feature.
@@ -8476,7 +7771,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__PRES_COND = eINSTANCE.getTDataAttribute_PresCond();
+        EAttribute DATA_ATTRIBUTE__PRES_COND = eINSTANCE.getDataAttribute_PresCond();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args</b></em>' attribute feature.
@@ -8484,7 +7779,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__PRES_COND_ARGS = eINSTANCE.getTDataAttribute_PresCondArgs();
+        EAttribute DATA_ATTRIBUTE__PRES_COND_ARGS = eINSTANCE.getDataAttribute_PresCondArgs();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args ID</b></em>' attribute feature.
@@ -8492,7 +7787,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__PRES_COND_ARGS_ID = eINSTANCE.getTDataAttribute_PresCondArgsID();
+        EAttribute DATA_ATTRIBUTE__PRES_COND_ARGS_ID = eINSTANCE.getDataAttribute_PresCondArgsID();
 
         /**
          * The meta object literal for the '<em><b>Qchg</b></em>' attribute feature.
@@ -8500,7 +7795,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__QCHG = eINSTANCE.getTDataAttribute_Qchg();
+        EAttribute DATA_ATTRIBUTE__QCHG = eINSTANCE.getDataAttribute_Qchg();
 
         /**
          * The meta object literal for the '<em><b>Size Attribute</b></em>' attribute feature.
@@ -8508,7 +7803,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__SIZE_ATTRIBUTE = eINSTANCE.getTDataAttribute_SizeAttribute();
+        EAttribute DATA_ATTRIBUTE__SIZE_ATTRIBUTE = eINSTANCE.getDataAttribute_SizeAttribute();
 
         /**
          * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
@@ -8516,7 +7811,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__TYPE = eINSTANCE.getTDataAttribute_Type();
+        EAttribute DATA_ATTRIBUTE__TYPE = eINSTANCE.getDataAttribute_Type();
 
         /**
          * The meta object literal for the '<em><b>Type Kind</b></em>' attribute feature.
@@ -8524,17 +7819,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_ATTRIBUTE__TYPE_KIND = eINSTANCE.getTDataAttribute_TypeKind();
+        EAttribute DATA_ATTRIBUTE__TYPE_KIND = eINSTANCE.getDataAttribute_TypeKind();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl <em>TData Object</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl <em>Data Object</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDataObject()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDataObject()
          * @generated
          */
-        EClass TDATA_OBJECT = eINSTANCE.getTDataObject();
+        EClass DATA_OBJECT = eINSTANCE.getDataObject();
 
         /**
          * The meta object literal for the '<em><b>Ds Pres Cond</b></em>' attribute feature.
@@ -8542,7 +7837,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__DS_PRES_COND = eINSTANCE.getTDataObject_DsPresCond();
+        EAttribute DATA_OBJECT__DS_PRES_COND = eINSTANCE.getDataObject_DsPresCond();
 
         /**
          * The meta object literal for the '<em><b>Ds Pres Cond Args</b></em>' attribute feature.
@@ -8550,7 +7845,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__DS_PRES_COND_ARGS = eINSTANCE.getTDataObject_DsPresCondArgs();
+        EAttribute DATA_OBJECT__DS_PRES_COND_ARGS = eINSTANCE.getDataObject_DsPresCondArgs();
 
         /**
          * The meta object literal for the '<em><b>Ds Pres Cond Args ID</b></em>' attribute feature.
@@ -8558,7 +7853,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__DS_PRES_COND_ARGS_ID = eINSTANCE.getTDataObject_DsPresCondArgsID();
+        EAttribute DATA_OBJECT__DS_PRES_COND_ARGS_ID = eINSTANCE.getDataObject_DsPresCondArgsID();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -8566,7 +7861,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__NAME = eINSTANCE.getTDataObject_Name();
+        EAttribute DATA_OBJECT__NAME = eINSTANCE.getDataObject_Name();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond</b></em>' attribute feature.
@@ -8574,7 +7869,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__PRES_COND = eINSTANCE.getTDataObject_PresCond();
+        EAttribute DATA_OBJECT__PRES_COND = eINSTANCE.getDataObject_PresCond();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args</b></em>' attribute feature.
@@ -8582,7 +7877,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__PRES_COND_ARGS = eINSTANCE.getTDataObject_PresCondArgs();
+        EAttribute DATA_OBJECT__PRES_COND_ARGS = eINSTANCE.getDataObject_PresCondArgs();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args ID</b></em>' attribute feature.
@@ -8590,7 +7885,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__PRES_COND_ARGS_ID = eINSTANCE.getTDataObject_PresCondArgsID();
+        EAttribute DATA_OBJECT__PRES_COND_ARGS_ID = eINSTANCE.getDataObject_PresCondArgsID();
 
         /**
          * The meta object literal for the '<em><b>Transient</b></em>' attribute feature.
@@ -8598,7 +7893,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__TRANSIENT = eINSTANCE.getTDataObject_Transient();
+        EAttribute DATA_OBJECT__TRANSIENT = eINSTANCE.getDataObject_Transient();
 
         /**
          * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
@@ -8606,7 +7901,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__TYPE = eINSTANCE.getTDataObject_Type();
+        EAttribute DATA_OBJECT__TYPE = eINSTANCE.getDataObject_Type();
 
         /**
          * The meta object literal for the '<em><b>Underlying Type</b></em>' attribute feature.
@@ -8614,7 +7909,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__UNDERLYING_TYPE = eINSTANCE.getTDataObject_UnderlyingType();
+        EAttribute DATA_OBJECT__UNDERLYING_TYPE = eINSTANCE.getDataObject_UnderlyingType();
 
         /**
          * The meta object literal for the '<em><b>Underlying Type Kind</b></em>' attribute feature.
@@ -8622,17 +7917,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_OBJECT__UNDERLYING_TYPE_KIND = eINSTANCE.getTDataObject_UnderlyingTypeKind();
+        EAttribute DATA_OBJECT__UNDERLYING_TYPE_KIND = eINSTANCE.getDataObject_UnderlyingTypeKind();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataSetMemberOfImpl <em>TData Set Member Of</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataSetMemberOfImpl <em>Data Set Member Of</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataSetMemberOfImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDataSetMemberOf()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataSetMemberOfImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDataSetMemberOf()
          * @generated
          */
-        EClass TDATA_SET_MEMBER_OF = eINSTANCE.getTDataSetMemberOf();
+        EClass DATA_SET_MEMBER_OF = eINSTANCE.getDataSetMemberOf();
 
         /**
          * The meta object literal for the '<em><b>Cb</b></em>' attribute feature.
@@ -8640,17 +7935,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDATA_SET_MEMBER_OF__CB = eINSTANCE.getTDataSetMemberOf_Cb();
+        EAttribute DATA_SET_MEMBER_OF__CB = eINSTANCE.getDataSetMemberOf_Cb();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocImpl <em>TDoc</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocImpl <em>Doc</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDoc()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDoc()
          * @generated
          */
-        EClass TDOC = eINSTANCE.getTDoc();
+        EClass DOC = eINSTANCE.getDoc();
 
         /**
          * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
@@ -8658,7 +7953,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDOC__MIXED = eINSTANCE.getTDoc_Mixed();
+        EAttribute DOC__MIXED = eINSTANCE.getDoc_Mixed();
 
         /**
          * The meta object literal for the '<em><b>Group</b></em>' attribute list feature.
@@ -8666,7 +7961,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDOC__GROUP = eINSTANCE.getTDoc_Group();
+        EAttribute DOC__GROUP = eINSTANCE.getDoc_Group();
 
         /**
          * The meta object literal for the '<em><b>Any</b></em>' attribute list feature.
@@ -8674,7 +7969,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDOC__ANY = eINSTANCE.getTDoc_Any();
+        EAttribute DOC__ANY = eINSTANCE.getDoc_Any();
 
         /**
          * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
@@ -8682,17 +7977,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDOC__ID = eINSTANCE.getTDoc_Id();
+        EAttribute DOC__ID = eINSTANCE.getDoc_Id();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocumentedClassImpl <em>TDocumented Class</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocumentedClassImpl <em>Documented Class</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocumentedClassImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDocumentedClass()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocumentedClassImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDocumentedClass()
          * @generated
          */
-        EClass TDOCUMENTED_CLASS = eINSTANCE.getTDocumentedClass();
+        EClass DOCUMENTED_CLASS = eINSTANCE.getDocumentedClass();
 
         /**
          * The meta object literal for the '<em><b>Deprecated</b></em>' attribute feature.
@@ -8700,7 +7995,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDOCUMENTED_CLASS__DEPRECATED = eINSTANCE.getTDocumentedClass_Deprecated();
+        EAttribute DOCUMENTED_CLASS__DEPRECATED = eINSTANCE.getDocumentedClass_Deprecated();
 
         /**
          * The meta object literal for the '<em><b>Desc ID</b></em>' attribute feature.
@@ -8708,7 +8003,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDOCUMENTED_CLASS__DESC_ID = eINSTANCE.getTDocumentedClass_DescID();
+        EAttribute DOCUMENTED_CLASS__DESC_ID = eINSTANCE.getDocumentedClass_DescID();
 
         /**
          * The meta object literal for the '<em><b>Informative</b></em>' attribute feature.
@@ -8716,17 +8011,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TDOCUMENTED_CLASS__INFORMATIVE = eINSTANCE.getTDocumentedClass_Informative();
+        EAttribute DOCUMENTED_CLASS__INFORMATIVE = eINSTANCE.getDocumentedClass_Informative();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationImpl <em>TEnumeration</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationImpl <em>Enumeration</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTEnumeration()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getEnumeration()
          * @generated
          */
-        EClass TENUMERATION = eINSTANCE.getTEnumeration();
+        EClass ENUMERATION = eINSTANCE.getEnumeration();
 
         /**
          * The meta object literal for the '<em><b>Literal</b></em>' containment reference list feature.
@@ -8734,7 +8029,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TENUMERATION__LITERAL = eINSTANCE.getTEnumeration_Literal();
+        EReference ENUMERATION__LITERAL = eINSTANCE.getEnumeration_Literal();
 
         /**
          * The meta object literal for the '<em><b>Inherited From</b></em>' attribute feature.
@@ -8742,7 +8037,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TENUMERATION__INHERITED_FROM = eINSTANCE.getTEnumeration_InheritedFrom();
+        EAttribute ENUMERATION__INHERITED_FROM = eINSTANCE.getEnumeration_InheritedFrom();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -8750,17 +8045,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TENUMERATION__NAME = eINSTANCE.getTEnumeration_Name();
+        EAttribute ENUMERATION__NAME = eINSTANCE.getEnumeration_Name();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationsImpl <em>TEnumerations</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationsImpl <em>Enumerations</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationsImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTEnumerations()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationsImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getEnumerations()
          * @generated
          */
-        EClass TENUMERATIONS = eINSTANCE.getTEnumerations();
+        EClass ENUMERATIONS = eINSTANCE.getEnumerations();
 
         /**
          * The meta object literal for the '<em><b>Enumeration</b></em>' containment reference list feature.
@@ -8768,17 +8063,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TENUMERATIONS__ENUMERATION = eINSTANCE.getTEnumerations_Enumeration();
+        EReference ENUMERATIONS__ENUMERATION = eINSTANCE.getEnumerations_Enumeration();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintImpl <em>TFunctional Constraint</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintImpl <em>Functional Constraint</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTFunctionalConstraint()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getFunctionalConstraint()
          * @generated
          */
-        EClass TFUNCTIONAL_CONSTRAINT = eINSTANCE.getTFunctionalConstraint();
+        EClass FUNCTIONAL_CONSTRAINT = eINSTANCE.getFunctionalConstraint();
 
         /**
          * The meta object literal for the '<em><b>Applicable Services</b></em>' containment reference feature.
@@ -8786,8 +8081,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES = eINSTANCE
-                .getTFunctionalConstraint_ApplicableServices();
+        EReference FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES = eINSTANCE.getFunctionalConstraint_ApplicableServices();
 
         /**
          * The meta object literal for the '<em><b>Abbreviation</b></em>' attribute feature.
@@ -8795,7 +8089,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TFUNCTIONAL_CONSTRAINT__ABBREVIATION = eINSTANCE.getTFunctionalConstraint_Abbreviation();
+        EAttribute FUNCTIONAL_CONSTRAINT__ABBREVIATION = eINSTANCE.getFunctionalConstraint_Abbreviation();
 
         /**
          * The meta object literal for the '<em><b>Desc ID</b></em>' attribute feature.
@@ -8803,7 +8097,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TFUNCTIONAL_CONSTRAINT__DESC_ID = eINSTANCE.getTFunctionalConstraint_DescID();
+        EAttribute FUNCTIONAL_CONSTRAINT__DESC_ID = eINSTANCE.getFunctionalConstraint_DescID();
 
         /**
          * The meta object literal for the '<em><b>Title ID</b></em>' attribute feature.
@@ -8811,17 +8105,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TFUNCTIONAL_CONSTRAINT__TITLE_ID = eINSTANCE.getTFunctionalConstraint_TitleID();
+        EAttribute FUNCTIONAL_CONSTRAINT__TITLE_ID = eINSTANCE.getFunctionalConstraint_TitleID();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintsImpl <em>TFunctional Constraints</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintsImpl <em>Functional Constraints</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintsImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTFunctionalConstraints()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintsImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getFunctionalConstraints()
          * @generated
          */
-        EClass TFUNCTIONAL_CONSTRAINTS = eINSTANCE.getTFunctionalConstraints();
+        EClass FUNCTIONAL_CONSTRAINTS = eINSTANCE.getFunctionalConstraints();
 
         /**
          * The meta object literal for the '<em><b>Functional Constraint</b></em>' containment reference list feature.
@@ -8829,18 +8123,18 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT = eINSTANCE
-                .getTFunctionalConstraints_FunctionalConstraint();
+        EReference FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT = eINSTANCE
+                .getFunctionalConstraints_FunctionalConstraint();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLicenseImpl <em>TLicense</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LicenseImpl <em>License</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLicenseImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLicense()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LicenseImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLicense()
          * @generated
          */
-        EClass TLICENSE = eINSTANCE.getTLicense();
+        EClass LICENSE = eINSTANCE.getLicense();
 
         /**
          * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
@@ -8848,7 +8142,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TLICENSE__MIXED = eINSTANCE.getTLicense_Mixed();
+        EAttribute LICENSE__MIXED = eINSTANCE.getLicense_Mixed();
 
         /**
          * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
@@ -8856,7 +8150,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TLICENSE__KIND = eINSTANCE.getTLicense_Kind();
+        EAttribute LICENSE__KIND = eINSTANCE.getLicense_Kind();
 
         /**
          * The meta object literal for the '<em><b>Uri</b></em>' attribute feature.
@@ -8864,17 +8158,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TLICENSE__URI = eINSTANCE.getTLicense_Uri();
+        EAttribute LICENSE__URI = eINSTANCE.getLicense_Uri();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLiteralImpl <em>TLiteral</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LiteralImpl <em>Literal</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLiteralImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLiteral()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LiteralImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLiteral()
          * @generated
          */
-        EClass TLITERAL = eINSTANCE.getTLiteral();
+        EClass LITERAL = eINSTANCE.getLiteral();
 
         /**
          * The meta object literal for the '<em><b>Literal Val</b></em>' attribute feature.
@@ -8882,7 +8176,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TLITERAL__LITERAL_VAL = eINSTANCE.getTLiteral_LiteralVal();
+        EAttribute LITERAL__LITERAL_VAL = eINSTANCE.getLiteral_LiteralVal();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -8890,17 +8184,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TLITERAL__NAME = eINSTANCE.getTLiteral_Name();
+        EAttribute LITERAL__NAME = eINSTANCE.getLiteral_Name();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassImpl <em>TLN Class</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassImpl <em>LN Class</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLNClass()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLNClass()
          * @generated
          */
-        EClass TLN_CLASS = eINSTANCE.getTLNClass();
+        EClass LN_CLASS = eINSTANCE.getLNClass();
 
         /**
          * The meta object literal for the '<em><b>Can Have LOG</b></em>' attribute feature.
@@ -8908,7 +8202,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TLN_CLASS__CAN_HAVE_LOG = eINSTANCE.getTLNClass_CanHaveLOG();
+        EAttribute LN_CLASS__CAN_HAVE_LOG = eINSTANCE.getLNClass_CanHaveLOG();
 
         /**
          * The meta object literal for the '<em><b>Is Extension</b></em>' attribute feature.
@@ -8916,7 +8210,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TLN_CLASS__IS_EXTENSION = eINSTANCE.getTLNClass_IsExtension();
+        EAttribute LN_CLASS__IS_EXTENSION = eINSTANCE.getLNClass_IsExtension();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -8924,17 +8218,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TLN_CLASS__NAME = eINSTANCE.getTLNClass_Name();
+        EAttribute LN_CLASS__NAME = eINSTANCE.getLNClass_Name();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassesImpl <em>TLN Classes</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassesImpl <em>LN Classes</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassesImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLNClasses()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassesImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLNClasses()
          * @generated
          */
-        EClass TLN_CLASSES = eINSTANCE.getTLNClasses();
+        EClass LN_CLASSES = eINSTANCE.getLNClasses();
 
         /**
          * The meta object literal for the '<em><b>Abstract LN Class</b></em>' containment reference list feature.
@@ -8942,7 +8236,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TLN_CLASSES__ABSTRACT_LN_CLASS = eINSTANCE.getTLNClasses_AbstractLNClass();
+        EReference LN_CLASSES__ABSTRACT_LN_CLASS = eINSTANCE.getLNClasses_AbstractLNClass();
 
         /**
          * The meta object literal for the '<em><b>LN Class</b></em>' containment reference list feature.
@@ -8950,17 +8244,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TLN_CLASSES__LN_CLASS = eINSTANCE.getTLNClasses_LNClass();
+        EReference LN_CLASSES__LN_CLASS = eINSTANCE.getLNClasses_LNClass();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNoticeImpl <em>TNotice</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NoticeImpl <em>Notice</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNoticeImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNotice()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NoticeImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getNotice()
          * @generated
          */
-        EClass TNOTICE = eINSTANCE.getTNotice();
+        EClass NOTICE = eINSTANCE.getNotice();
 
         /**
          * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
@@ -8968,17 +8262,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNOTICE__MIXED = eINSTANCE.getTNotice_Mixed();
+        EAttribute NOTICE__MIXED = eINSTANCE.getNotice_Mixed();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl <em>TNS</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl <em>NS</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNS()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getNS()
          * @generated
          */
-        EClass TNS = eINSTANCE.getTNS();
+        EClass NS = eINSTANCE.getNS();
 
         /**
          * The meta object literal for the '<em><b>Changes</b></em>' containment reference feature.
@@ -8986,7 +8280,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__CHANGES = eINSTANCE.getTNS_Changes();
+        EReference NS__CHANGES = eINSTANCE.getNS_Changes();
 
         /**
          * The meta object literal for the '<em><b>Depends On</b></em>' containment reference feature.
@@ -8994,7 +8288,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__DEPENDS_ON = eINSTANCE.getTNS_DependsOn();
+        EReference NS__DEPENDS_ON = eINSTANCE.getNS_DependsOn();
 
         /**
          * The meta object literal for the '<em><b>Basic Types</b></em>' containment reference feature.
@@ -9002,7 +8296,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__BASIC_TYPES = eINSTANCE.getTNS_BasicTypes();
+        EReference NS__BASIC_TYPES = eINSTANCE.getNS_BasicTypes();
 
         /**
          * The meta object literal for the '<em><b>Functional Constraints</b></em>' containment reference feature.
@@ -9010,7 +8304,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__FUNCTIONAL_CONSTRAINTS = eINSTANCE.getTNS_FunctionalConstraints();
+        EReference NS__FUNCTIONAL_CONSTRAINTS = eINSTANCE.getNS_FunctionalConstraints();
 
         /**
          * The meta object literal for the '<em><b>Presence Conditions</b></em>' containment reference feature.
@@ -9018,7 +8312,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__PRESENCE_CONDITIONS = eINSTANCE.getTNS_PresenceConditions();
+        EReference NS__PRESENCE_CONDITIONS = eINSTANCE.getNS_PresenceConditions();
 
         /**
          * The meta object literal for the '<em><b>Abbreviations</b></em>' containment reference feature.
@@ -9026,7 +8320,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__ABBREVIATIONS = eINSTANCE.getTNS_Abbreviations();
+        EReference NS__ABBREVIATIONS = eINSTANCE.getNS_Abbreviations();
 
         /**
          * The meta object literal for the '<em><b>Enumerations</b></em>' containment reference feature.
@@ -9034,7 +8328,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__ENUMERATIONS = eINSTANCE.getTNS_Enumerations();
+        EReference NS__ENUMERATIONS = eINSTANCE.getNS_Enumerations();
 
         /**
          * The meta object literal for the '<em><b>Constructed Attributes</b></em>' containment reference feature.
@@ -9042,7 +8336,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__CONSTRUCTED_ATTRIBUTES = eINSTANCE.getTNS_ConstructedAttributes();
+        EReference NS__CONSTRUCTED_ATTRIBUTES = eINSTANCE.getNS_ConstructedAttributes();
 
         /**
          * The meta object literal for the '<em><b>CD Cs</b></em>' containment reference feature.
@@ -9050,7 +8344,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__CD_CS = eINSTANCE.getTNS_CDCs();
+        EReference NS__CD_CS = eINSTANCE.getNS_CDCs();
 
         /**
          * The meta object literal for the '<em><b>LN Classes</b></em>' containment reference feature.
@@ -9058,7 +8352,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS__LN_CLASSES = eINSTANCE.getTNS_LNClasses();
+        EReference NS__LN_CLASSES = eINSTANCE.getNS_LNClasses();
 
         /**
          * The meta object literal for the '<em><b>Desc ID</b></em>' attribute feature.
@@ -9066,7 +8360,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS__DESC_ID = eINSTANCE.getTNS_DescID();
+        EAttribute NS__DESC_ID = eINSTANCE.getNS_DescID();
 
         /**
          * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
@@ -9074,7 +8368,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS__ID = eINSTANCE.getTNS_Id();
+        EAttribute NS__ID = eINSTANCE.getNS_Id();
 
         /**
          * The meta object literal for the '<em><b>Publication Stage</b></em>' attribute feature.
@@ -9082,15 +8376,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS__PUBLICATION_STAGE = eINSTANCE.getTNS_PublicationStage();
-
-        /**
-         * The meta object literal for the '<em><b>Release</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TNS__RELEASE = eINSTANCE.getTNS_Release();
+        EAttribute NS__PUBLICATION_STAGE = eINSTANCE.getNS_PublicationStage();
 
         /**
          * The meta object literal for the '<em><b>Revision</b></em>' attribute feature.
@@ -9098,7 +8384,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS__REVISION = eINSTANCE.getTNS_Revision();
+        EAttribute NS__REVISION = eINSTANCE.getNS_Revision();
 
         /**
          * The meta object literal for the '<em><b>Uml Date</b></em>' attribute feature.
@@ -9106,7 +8392,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS__UML_DATE = eINSTANCE.getTNS_UmlDate();
+        EAttribute NS__UML_DATE = eINSTANCE.getNS_UmlDate();
 
         /**
          * The meta object literal for the '<em><b>Uml Version</b></em>' attribute feature.
@@ -9114,25 +8400,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS__UML_VERSION = eINSTANCE.getTNS_UmlVersion();
-
-        /**
-         * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TNS__VERSION = eINSTANCE.getTNS_Version();
+        EAttribute NS__UML_VERSION = eINSTANCE.getNS_UmlVersion();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl <em>TNS Doc</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl <em>NS Doc</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSDoc()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getNSDoc()
          * @generated
          */
-        EClass TNS_DOC = eINSTANCE.getTNSDoc();
+        EClass NS_DOC = eINSTANCE.getNSDoc();
 
         /**
          * The meta object literal for the '<em><b>Doc</b></em>' containment reference list feature.
@@ -9140,7 +8418,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TNS_DOC__DOC = eINSTANCE.getTNSDoc_Doc();
+        EReference NS_DOC__DOC = eINSTANCE.getNSDoc_Doc();
 
         /**
          * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
@@ -9148,7 +8426,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS_DOC__ID = eINSTANCE.getTNSDoc_Id();
+        EAttribute NS_DOC__ID = eINSTANCE.getNSDoc_Id();
 
         /**
          * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
@@ -9156,7 +8434,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS_DOC__LANG = eINSTANCE.getTNSDoc_Lang();
+        EAttribute NS_DOC__LANG = eINSTANCE.getNSDoc_Lang();
 
         /**
          * The meta object literal for the '<em><b>Publication Stage</b></em>' attribute feature.
@@ -9164,15 +8442,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS_DOC__PUBLICATION_STAGE = eINSTANCE.getTNSDoc_PublicationStage();
-
-        /**
-         * The meta object literal for the '<em><b>Release</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TNS_DOC__RELEASE = eINSTANCE.getTNSDoc_Release();
+        EAttribute NS_DOC__PUBLICATION_STAGE = eINSTANCE.getNSDoc_PublicationStage();
 
         /**
          * The meta object literal for the '<em><b>Revision</b></em>' attribute feature.
@@ -9180,7 +8450,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS_DOC__REVISION = eINSTANCE.getTNSDoc_Revision();
+        EAttribute NS_DOC__REVISION = eINSTANCE.getNSDoc_Revision();
 
         /**
          * The meta object literal for the '<em><b>Uml Date</b></em>' attribute feature.
@@ -9188,7 +8458,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS_DOC__UML_DATE = eINSTANCE.getTNSDoc_UmlDate();
+        EAttribute NS_DOC__UML_DATE = eINSTANCE.getNSDoc_UmlDate();
 
         /**
          * The meta object literal for the '<em><b>Uml Version</b></em>' attribute feature.
@@ -9196,25 +8466,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TNS_DOC__UML_VERSION = eINSTANCE.getTNSDoc_UmlVersion();
-
-        /**
-         * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TNS_DOC__VERSION = eINSTANCE.getTNSDoc_Version();
+        EAttribute NS_DOC__UML_VERSION = eINSTANCE.getNSDoc_UmlVersion();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionImpl <em>TPresence Condition</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionImpl <em>Presence Condition</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPresenceCondition()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getPresenceCondition()
          * @generated
          */
-        EClass TPRESENCE_CONDITION = eINSTANCE.getTPresenceCondition();
+        EClass PRESENCE_CONDITION = eINSTANCE.getPresenceCondition();
 
         /**
          * The meta object literal for the '<em><b>Argument</b></em>' attribute feature.
@@ -9222,7 +8484,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TPRESENCE_CONDITION__ARGUMENT = eINSTANCE.getTPresenceCondition_Argument();
+        EAttribute PRESENCE_CONDITION__ARGUMENT = eINSTANCE.getPresenceCondition_Argument();
 
         /**
          * The meta object literal for the '<em><b>Desc ID</b></em>' attribute feature.
@@ -9230,7 +8492,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TPRESENCE_CONDITION__DESC_ID = eINSTANCE.getTPresenceCondition_DescID();
+        EAttribute PRESENCE_CONDITION__DESC_ID = eINSTANCE.getPresenceCondition_DescID();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -9238,7 +8500,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TPRESENCE_CONDITION__NAME = eINSTANCE.getTPresenceCondition_Name();
+        EAttribute PRESENCE_CONDITION__NAME = eINSTANCE.getPresenceCondition_Name();
 
         /**
          * The meta object literal for the '<em><b>Title ID</b></em>' attribute feature.
@@ -9246,17 +8508,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TPRESENCE_CONDITION__TITLE_ID = eINSTANCE.getTPresenceCondition_TitleID();
+        EAttribute PRESENCE_CONDITION__TITLE_ID = eINSTANCE.getPresenceCondition_TitleID();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionsImpl <em>TPresence Conditions</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionsImpl <em>Presence Conditions</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionsImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPresenceConditions()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionsImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getPresenceConditions()
          * @generated
          */
-        EClass TPRESENCE_CONDITIONS = eINSTANCE.getTPresenceConditions();
+        EClass PRESENCE_CONDITIONS = eINSTANCE.getPresenceConditions();
 
         /**
          * The meta object literal for the '<em><b>Presence Condition</b></em>' containment reference list feature.
@@ -9264,17 +8526,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TPRESENCE_CONDITIONS__PRESENCE_CONDITION = eINSTANCE.getTPresenceConditions_PresenceCondition();
+        EReference PRESENCE_CONDITIONS__PRESENCE_CONDITION = eINSTANCE.getPresenceConditions_PresenceCondition();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCImpl <em>TService CDC</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCImpl <em>Service CDC</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceCDC()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceCDC()
          * @generated
          */
-        EClass TSERVICE_CDC = eINSTANCE.getTServiceCDC();
+        EClass SERVICE_CDC = eINSTANCE.getServiceCDC();
 
         /**
          * The meta object literal for the '<em><b>Service Data Attribute</b></em>' containment reference list feature.
@@ -9282,7 +8544,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE = eINSTANCE.getTServiceCDC_ServiceDataAttribute();
+        EReference SERVICE_CDC__SERVICE_DATA_ATTRIBUTE = eINSTANCE.getServiceCDC_ServiceDataAttribute();
 
         /**
          * The meta object literal for the '<em><b>Cdc</b></em>' attribute feature.
@@ -9290,7 +8552,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_CDC__CDC = eINSTANCE.getTServiceCDC_Cdc();
+        EAttribute SERVICE_CDC__CDC = eINSTANCE.getServiceCDC_Cdc();
 
         /**
          * The meta object literal for the '<em><b>Variant</b></em>' attribute feature.
@@ -9298,17 +8560,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_CDC__VARIANT = eINSTANCE.getTServiceCDC_Variant();
+        EAttribute SERVICE_CDC__VARIANT = eINSTANCE.getServiceCDC_Variant();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCsImpl <em>TService CD Cs</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCsImpl <em>Service CD Cs</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCsImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceCDCs()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCsImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceCDCs()
          * @generated
          */
-        EClass TSERVICE_CD_CS = eINSTANCE.getTServiceCDCs();
+        EClass SERVICE_CD_CS = eINSTANCE.getServiceCDCs();
 
         /**
          * The meta object literal for the '<em><b>Service CDC</b></em>' containment reference list feature.
@@ -9316,17 +8578,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_CD_CS__SERVICE_CDC = eINSTANCE.getTServiceCDCs_ServiceCDC();
+        EReference SERVICE_CD_CS__SERVICE_CDC = eINSTANCE.getServiceCDCs_ServiceCDC();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributeImpl <em>TService Constructed Attribute</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributeImpl <em>Service Constructed Attribute</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributeImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceConstructedAttribute()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributeImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceConstructedAttribute()
          * @generated
          */
-        EClass TSERVICE_CONSTRUCTED_ATTRIBUTE = eINSTANCE.getTServiceConstructedAttribute();
+        EClass SERVICE_CONSTRUCTED_ATTRIBUTE = eINSTANCE.getServiceConstructedAttribute();
 
         /**
          * The meta object literal for the '<em><b>Type Kind Parameterized</b></em>' attribute feature.
@@ -9334,18 +8596,18 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED = eINSTANCE
-                .getTServiceConstructedAttribute_TypeKindParameterized();
+        EAttribute SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED = eINSTANCE
+                .getServiceConstructedAttribute_TypeKindParameterized();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributesImpl <em>TService Constructed Attributes</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributesImpl <em>Service Constructed Attributes</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributesImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceConstructedAttributes()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributesImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceConstructedAttributes()
          * @generated
          */
-        EClass TSERVICE_CONSTRUCTED_ATTRIBUTES = eINSTANCE.getTServiceConstructedAttributes();
+        EClass SERVICE_CONSTRUCTED_ATTRIBUTES = eINSTANCE.getServiceConstructedAttributes();
 
         /**
          * The meta object literal for the '<em><b>Service Constructed Attribute</b></em>' containment reference list feature.
@@ -9353,18 +8615,18 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE = eINSTANCE
-                .getTServiceConstructedAttributes_ServiceConstructedAttribute();
+        EReference SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE = eINSTANCE
+                .getServiceConstructedAttributes_ServiceConstructedAttribute();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl <em>TService Data Attribute</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl <em>Service Data Attribute</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceDataAttribute()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceDataAttribute()
          * @generated
          */
-        EClass TSERVICE_DATA_ATTRIBUTE = eINSTANCE.getTServiceDataAttribute();
+        EClass SERVICE_DATA_ATTRIBUTE = eINSTANCE.getServiceDataAttribute();
 
         /**
          * The meta object literal for the '<em><b>Fc</b></em>' attribute feature.
@@ -9372,7 +8634,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_DATA_ATTRIBUTE__FC = eINSTANCE.getTServiceDataAttribute_Fc();
+        EAttribute SERVICE_DATA_ATTRIBUTE__FC = eINSTANCE.getServiceDataAttribute_Fc();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -9380,7 +8642,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_DATA_ATTRIBUTE__NAME = eINSTANCE.getTServiceDataAttribute_Name();
+        EAttribute SERVICE_DATA_ATTRIBUTE__NAME = eINSTANCE.getServiceDataAttribute_Name();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond</b></em>' attribute feature.
@@ -9388,7 +8650,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_DATA_ATTRIBUTE__PRES_COND = eINSTANCE.getTServiceDataAttribute_PresCond();
+        EAttribute SERVICE_DATA_ATTRIBUTE__PRES_COND = eINSTANCE.getServiceDataAttribute_PresCond();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args</b></em>' attribute feature.
@@ -9396,7 +8658,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS = eINSTANCE.getTServiceDataAttribute_PresCondArgs();
+        EAttribute SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS = eINSTANCE.getServiceDataAttribute_PresCondArgs();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args ID</b></em>' attribute feature.
@@ -9404,7 +8666,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID = eINSTANCE.getTServiceDataAttribute_PresCondArgsID();
+        EAttribute SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID = eINSTANCE.getServiceDataAttribute_PresCondArgsID();
 
         /**
          * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
@@ -9412,7 +8674,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_DATA_ATTRIBUTE__TYPE = eINSTANCE.getTServiceDataAttribute_Type();
+        EAttribute SERVICE_DATA_ATTRIBUTE__TYPE = eINSTANCE.getServiceDataAttribute_Type();
 
         /**
          * The meta object literal for the '<em><b>Type Kind</b></em>' attribute feature.
@@ -9420,7 +8682,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_DATA_ATTRIBUTE__TYPE_KIND = eINSTANCE.getTServiceDataAttribute_TypeKind();
+        EAttribute SERVICE_DATA_ATTRIBUTE__TYPE_KIND = eINSTANCE.getServiceDataAttribute_TypeKind();
 
         /**
          * The meta object literal for the '<em><b>Underlying Type</b></em>' attribute feature.
@@ -9428,7 +8690,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE = eINSTANCE.getTServiceDataAttribute_UnderlyingType();
+        EAttribute SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE = eINSTANCE.getServiceDataAttribute_UnderlyingType();
 
         /**
          * The meta object literal for the '<em><b>Underlying Type Kind</b></em>' attribute feature.
@@ -9436,18 +8698,18 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND = eINSTANCE
-                .getTServiceDataAttribute_UnderlyingTypeKind();
+        EAttribute SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND = eINSTANCE
+                .getServiceDataAttribute_UnderlyingTypeKind();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl <em>TService NS</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl <em>Service NS</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceNS()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceNS()
          * @generated
          */
-        EClass TSERVICE_NS = eINSTANCE.getTServiceNS();
+        EClass SERVICE_NS = eINSTANCE.getServiceNS();
 
         /**
          * The meta object literal for the '<em><b>Changes</b></em>' containment reference feature.
@@ -9455,7 +8717,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_NS__CHANGES = eINSTANCE.getTServiceNS_Changes();
+        EReference SERVICE_NS__CHANGES = eINSTANCE.getServiceNS_Changes();
 
         /**
          * The meta object literal for the '<em><b>Functional Constraints</b></em>' containment reference feature.
@@ -9463,7 +8725,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_NS__FUNCTIONAL_CONSTRAINTS = eINSTANCE.getTServiceNS_FunctionalConstraints();
+        EReference SERVICE_NS__FUNCTIONAL_CONSTRAINTS = eINSTANCE.getServiceNS_FunctionalConstraints();
 
         /**
          * The meta object literal for the '<em><b>Presence Conditions</b></em>' containment reference feature.
@@ -9471,7 +8733,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_NS__PRESENCE_CONDITIONS = eINSTANCE.getTServiceNS_PresenceConditions();
+        EReference SERVICE_NS__PRESENCE_CONDITIONS = eINSTANCE.getServiceNS_PresenceConditions();
 
         /**
          * The meta object literal for the '<em><b>Abbreviations</b></em>' containment reference feature.
@@ -9479,7 +8741,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_NS__ABBREVIATIONS = eINSTANCE.getTServiceNS_Abbreviations();
+        EReference SERVICE_NS__ABBREVIATIONS = eINSTANCE.getServiceNS_Abbreviations();
 
         /**
          * The meta object literal for the '<em><b>Service Type Realizations</b></em>' containment reference feature.
@@ -9487,7 +8749,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_NS__SERVICE_TYPE_REALIZATIONS = eINSTANCE.getTServiceNS_ServiceTypeRealizations();
+        EReference SERVICE_NS__SERVICE_TYPE_REALIZATIONS = eINSTANCE.getServiceNS_ServiceTypeRealizations();
 
         /**
          * The meta object literal for the '<em><b>Service Constructed Attributes</b></em>' containment reference feature.
@@ -9495,7 +8757,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES = eINSTANCE.getTServiceNS_ServiceConstructedAttributes();
+        EReference SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES = eINSTANCE.getServiceNS_ServiceConstructedAttributes();
 
         /**
          * The meta object literal for the '<em><b>Service CD Cs</b></em>' containment reference feature.
@@ -9503,7 +8765,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_NS__SERVICE_CD_CS = eINSTANCE.getTServiceNS_ServiceCDCs();
+        EReference SERVICE_NS__SERVICE_CD_CS = eINSTANCE.getServiceNS_ServiceCDCs();
 
         /**
          * The meta object literal for the '<em><b>Desc ID</b></em>' attribute feature.
@@ -9511,7 +8773,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_NS__DESC_ID = eINSTANCE.getTServiceNS_DescID();
+        EAttribute SERVICE_NS__DESC_ID = eINSTANCE.getServiceNS_DescID();
 
         /**
          * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
@@ -9519,7 +8781,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_NS__ID = eINSTANCE.getTServiceNS_Id();
+        EAttribute SERVICE_NS__ID = eINSTANCE.getServiceNS_Id();
 
         /**
          * The meta object literal for the '<em><b>Publication Stage</b></em>' attribute feature.
@@ -9527,15 +8789,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_NS__PUBLICATION_STAGE = eINSTANCE.getTServiceNS_PublicationStage();
-
-        /**
-         * The meta object literal for the '<em><b>Release</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TSERVICE_NS__RELEASE = eINSTANCE.getTServiceNS_Release();
+        EAttribute SERVICE_NS__PUBLICATION_STAGE = eINSTANCE.getServiceNS_PublicationStage();
 
         /**
          * The meta object literal for the '<em><b>Revision</b></em>' attribute feature.
@@ -9543,7 +8797,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_NS__REVISION = eINSTANCE.getTServiceNS_Revision();
+        EAttribute SERVICE_NS__REVISION = eINSTANCE.getServiceNS_Revision();
 
         /**
          * The meta object literal for the '<em><b>Uml Date</b></em>' attribute feature.
@@ -9551,7 +8805,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_NS__UML_DATE = eINSTANCE.getTServiceNS_UmlDate();
+        EAttribute SERVICE_NS__UML_DATE = eINSTANCE.getServiceNS_UmlDate();
 
         /**
          * The meta object literal for the '<em><b>Uml Version</b></em>' attribute feature.
@@ -9559,25 +8813,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_NS__UML_VERSION = eINSTANCE.getTServiceNS_UmlVersion();
-
-        /**
-         * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TSERVICE_NS__VERSION = eINSTANCE.getTServiceNS_Version();
+        EAttribute SERVICE_NS__UML_VERSION = eINSTANCE.getServiceNS_UmlVersion();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl <em>TService Ns Usage</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNsUsageImpl <em>Service Ns Usage</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceNsUsage()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNsUsageImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceNsUsage()
          * @generated
          */
-        EClass TSERVICE_NS_USAGE = eINSTANCE.getTServiceNsUsage();
+        EClass SERVICE_NS_USAGE = eINSTANCE.getServiceNsUsage();
 
         /**
          * The meta object literal for the '<em><b>Applies To</b></em>' containment reference list feature.
@@ -9585,7 +8831,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_NS_USAGE__APPLIES_TO = eINSTANCE.getTServiceNsUsage_AppliesTo();
+        EReference SERVICE_NS_USAGE__APPLIES_TO = eINSTANCE.getServiceNsUsage_AppliesTo();
 
         /**
          * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
@@ -9593,7 +8839,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_NS_USAGE__ID = eINSTANCE.getTServiceNsUsage_Id();
+        EAttribute SERVICE_NS_USAGE__ID = eINSTANCE.getServiceNsUsage_Id();
 
         /**
          * The meta object literal for the '<em><b>Publication Stage</b></em>' attribute feature.
@@ -9601,15 +8847,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_NS_USAGE__PUBLICATION_STAGE = eINSTANCE.getTServiceNsUsage_PublicationStage();
-
-        /**
-         * The meta object literal for the '<em><b>Release</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TSERVICE_NS_USAGE__RELEASE = eINSTANCE.getTServiceNsUsage_Release();
+        EAttribute SERVICE_NS_USAGE__PUBLICATION_STAGE = eINSTANCE.getServiceNsUsage_PublicationStage();
 
         /**
          * The meta object literal for the '<em><b>Revision</b></em>' attribute feature.
@@ -9617,25 +8855,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_NS_USAGE__REVISION = eINSTANCE.getTServiceNsUsage_Revision();
-
-        /**
-         * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute TSERVICE_NS_USAGE__VERSION = eINSTANCE.getTServiceNsUsage_Version();
+        EAttribute SERVICE_NS_USAGE__REVISION = eINSTANCE.getServiceNsUsage_Revision();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl <em>TService Parameter</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl <em>Service Parameter</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceParameter()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceParameter()
          * @generated
          */
-        EClass TSERVICE_PARAMETER = eINSTANCE.getTServiceParameter();
+        EClass SERVICE_PARAMETER = eINSTANCE.getServiceParameter();
 
         /**
          * The meta object literal for the '<em><b>Default Value</b></em>' attribute feature.
@@ -9643,7 +8873,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_PARAMETER__DEFAULT_VALUE = eINSTANCE.getTServiceParameter_DefaultValue();
+        EAttribute SERVICE_PARAMETER__DEFAULT_VALUE = eINSTANCE.getServiceParameter_DefaultValue();
 
         /**
          * The meta object literal for the '<em><b>Max Value</b></em>' attribute feature.
@@ -9651,7 +8881,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_PARAMETER__MAX_VALUE = eINSTANCE.getTServiceParameter_MaxValue();
+        EAttribute SERVICE_PARAMETER__MAX_VALUE = eINSTANCE.getServiceParameter_MaxValue();
 
         /**
          * The meta object literal for the '<em><b>Min Value</b></em>' attribute feature.
@@ -9659,7 +8889,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_PARAMETER__MIN_VALUE = eINSTANCE.getTServiceParameter_MinValue();
+        EAttribute SERVICE_PARAMETER__MIN_VALUE = eINSTANCE.getServiceParameter_MinValue();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -9667,7 +8897,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_PARAMETER__NAME = eINSTANCE.getTServiceParameter_Name();
+        EAttribute SERVICE_PARAMETER__NAME = eINSTANCE.getServiceParameter_Name();
 
         /**
          * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
@@ -9675,7 +8905,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_PARAMETER__TYPE = eINSTANCE.getTServiceParameter_Type();
+        EAttribute SERVICE_PARAMETER__TYPE = eINSTANCE.getServiceParameter_Type();
 
         /**
          * The meta object literal for the '<em><b>Type Kind</b></em>' attribute feature.
@@ -9683,17 +8913,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_PARAMETER__TYPE_KIND = eINSTANCE.getTServiceParameter_TypeKind();
+        EAttribute SERVICE_PARAMETER__TYPE_KIND = eINSTANCE.getServiceParameter_TypeKind();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl <em>TService Type Realization</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl <em>Service Type Realization</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceTypeRealization()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceTypeRealization()
          * @generated
          */
-        EClass TSERVICE_TYPE_REALIZATION = eINSTANCE.getTServiceTypeRealization();
+        EClass SERVICE_TYPE_REALIZATION = eINSTANCE.getServiceTypeRealization();
 
         /**
          * The meta object literal for the '<em><b>Fc</b></em>' attribute feature.
@@ -9701,7 +8931,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_TYPE_REALIZATION__FC = eINSTANCE.getTServiceTypeRealization_Fc();
+        EAttribute SERVICE_TYPE_REALIZATION__FC = eINSTANCE.getServiceTypeRealization_Fc();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -9709,7 +8939,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_TYPE_REALIZATION__NAME = eINSTANCE.getTServiceTypeRealization_Name();
+        EAttribute SERVICE_TYPE_REALIZATION__NAME = eINSTANCE.getServiceTypeRealization_Name();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond</b></em>' attribute feature.
@@ -9717,7 +8947,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_TYPE_REALIZATION__PRES_COND = eINSTANCE.getTServiceTypeRealization_PresCond();
+        EAttribute SERVICE_TYPE_REALIZATION__PRES_COND = eINSTANCE.getServiceTypeRealization_PresCond();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args</b></em>' attribute feature.
@@ -9725,7 +8955,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS = eINSTANCE.getTServiceTypeRealization_PresCondArgs();
+        EAttribute SERVICE_TYPE_REALIZATION__PRES_COND_ARGS = eINSTANCE.getServiceTypeRealization_PresCondArgs();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args ID</b></em>' attribute feature.
@@ -9733,7 +8963,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID = eINSTANCE.getTServiceTypeRealization_PresCondArgsID();
+        EAttribute SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID = eINSTANCE.getServiceTypeRealization_PresCondArgsID();
 
         /**
          * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
@@ -9741,7 +8971,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_TYPE_REALIZATION__TYPE = eINSTANCE.getTServiceTypeRealization_Type();
+        EAttribute SERVICE_TYPE_REALIZATION__TYPE = eINSTANCE.getServiceTypeRealization_Type();
 
         /**
          * The meta object literal for the '<em><b>Type Kind</b></em>' attribute feature.
@@ -9749,17 +8979,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSERVICE_TYPE_REALIZATION__TYPE_KIND = eINSTANCE.getTServiceTypeRealization_TypeKind();
+        EAttribute SERVICE_TYPE_REALIZATION__TYPE_KIND = eINSTANCE.getServiceTypeRealization_TypeKind();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationsImpl <em>TService Type Realizations</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationsImpl <em>Service Type Realizations</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationsImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTServiceTypeRealizations()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationsImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getServiceTypeRealizations()
          * @generated
          */
-        EClass TSERVICE_TYPE_REALIZATIONS = eINSTANCE.getTServiceTypeRealizations();
+        EClass SERVICE_TYPE_REALIZATIONS = eINSTANCE.getServiceTypeRealizations();
 
         /**
          * The meta object literal for the '<em><b>Service Type Realization</b></em>' containment reference list feature.
@@ -9767,18 +8997,18 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EReference TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION = eINSTANCE
-                .getTServiceTypeRealizations_ServiceTypeRealization();
+        EReference SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION = eINSTANCE
+                .getServiceTypeRealizations_ServiceTypeRealization();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl <em>TSub Data Attribute</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl <em>Sub Data Attribute</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTSubDataAttribute()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getSubDataAttribute()
          * @generated
          */
-        EClass TSUB_DATA_ATTRIBUTE = eINSTANCE.getTSubDataAttribute();
+        EClass SUB_DATA_ATTRIBUTE = eINSTANCE.getSubDataAttribute();
 
         /**
          * The meta object literal for the '<em><b>Default Value</b></em>' attribute feature.
@@ -9786,7 +9016,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE = eINSTANCE.getTSubDataAttribute_DefaultValue();
+        EAttribute SUB_DATA_ATTRIBUTE__DEFAULT_VALUE = eINSTANCE.getSubDataAttribute_DefaultValue();
 
         /**
          * The meta object literal for the '<em><b>Is Array</b></em>' attribute feature.
@@ -9794,7 +9024,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__IS_ARRAY = eINSTANCE.getTSubDataAttribute_IsArray();
+        EAttribute SUB_DATA_ATTRIBUTE__IS_ARRAY = eINSTANCE.getSubDataAttribute_IsArray();
 
         /**
          * The meta object literal for the '<em><b>Max Index Attribute</b></em>' attribute feature.
@@ -9802,7 +9032,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE = eINSTANCE.getTSubDataAttribute_MaxIndexAttribute();
+        EAttribute SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE = eINSTANCE.getSubDataAttribute_MaxIndexAttribute();
 
         /**
          * The meta object literal for the '<em><b>Max Value</b></em>' attribute feature.
@@ -9810,7 +9040,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__MAX_VALUE = eINSTANCE.getTSubDataAttribute_MaxValue();
+        EAttribute SUB_DATA_ATTRIBUTE__MAX_VALUE = eINSTANCE.getSubDataAttribute_MaxValue();
 
         /**
          * The meta object literal for the '<em><b>Min Index</b></em>' attribute feature.
@@ -9818,7 +9048,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__MIN_INDEX = eINSTANCE.getTSubDataAttribute_MinIndex();
+        EAttribute SUB_DATA_ATTRIBUTE__MIN_INDEX = eINSTANCE.getSubDataAttribute_MinIndex();
 
         /**
          * The meta object literal for the '<em><b>Min Value</b></em>' attribute feature.
@@ -9826,7 +9056,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__MIN_VALUE = eINSTANCE.getTSubDataAttribute_MinValue();
+        EAttribute SUB_DATA_ATTRIBUTE__MIN_VALUE = eINSTANCE.getSubDataAttribute_MinValue();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -9834,7 +9064,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__NAME = eINSTANCE.getTSubDataAttribute_Name();
+        EAttribute SUB_DATA_ATTRIBUTE__NAME = eINSTANCE.getSubDataAttribute_Name();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond</b></em>' attribute feature.
@@ -9842,7 +9072,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__PRES_COND = eINSTANCE.getTSubDataAttribute_PresCond();
+        EAttribute SUB_DATA_ATTRIBUTE__PRES_COND = eINSTANCE.getSubDataAttribute_PresCond();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args</b></em>' attribute feature.
@@ -9850,7 +9080,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS = eINSTANCE.getTSubDataAttribute_PresCondArgs();
+        EAttribute SUB_DATA_ATTRIBUTE__PRES_COND_ARGS = eINSTANCE.getSubDataAttribute_PresCondArgs();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args ID</b></em>' attribute feature.
@@ -9858,7 +9088,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID = eINSTANCE.getTSubDataAttribute_PresCondArgsID();
+        EAttribute SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID = eINSTANCE.getSubDataAttribute_PresCondArgsID();
 
         /**
          * The meta object literal for the '<em><b>Size Attribute</b></em>' attribute feature.
@@ -9866,7 +9096,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE = eINSTANCE.getTSubDataAttribute_SizeAttribute();
+        EAttribute SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE = eINSTANCE.getSubDataAttribute_SizeAttribute();
 
         /**
          * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
@@ -9874,7 +9104,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__TYPE = eINSTANCE.getTSubDataAttribute_Type();
+        EAttribute SUB_DATA_ATTRIBUTE__TYPE = eINSTANCE.getSubDataAttribute_Type();
 
         /**
          * The meta object literal for the '<em><b>Type Kind</b></em>' attribute feature.
@@ -9882,17 +9112,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_ATTRIBUTE__TYPE_KIND = eINSTANCE.getTSubDataAttribute_TypeKind();
+        EAttribute SUB_DATA_ATTRIBUTE__TYPE_KIND = eINSTANCE.getSubDataAttribute_TypeKind();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl <em>TSub Data Object</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl <em>Sub Data Object</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTSubDataObject()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getSubDataObject()
          * @generated
          */
-        EClass TSUB_DATA_OBJECT = eINSTANCE.getTSubDataObject();
+        EClass SUB_DATA_OBJECT = eINSTANCE.getSubDataObject();
 
         /**
          * The meta object literal for the '<em><b>Is Array</b></em>' attribute feature.
@@ -9900,7 +9130,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__IS_ARRAY = eINSTANCE.getTSubDataObject_IsArray();
+        EAttribute SUB_DATA_OBJECT__IS_ARRAY = eINSTANCE.getSubDataObject_IsArray();
 
         /**
          * The meta object literal for the '<em><b>Max Index Attribute</b></em>' attribute feature.
@@ -9908,7 +9138,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE = eINSTANCE.getTSubDataObject_MaxIndexAttribute();
+        EAttribute SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE = eINSTANCE.getSubDataObject_MaxIndexAttribute();
 
         /**
          * The meta object literal for the '<em><b>Min Index</b></em>' attribute feature.
@@ -9916,7 +9146,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__MIN_INDEX = eINSTANCE.getTSubDataObject_MinIndex();
+        EAttribute SUB_DATA_OBJECT__MIN_INDEX = eINSTANCE.getSubDataObject_MinIndex();
 
         /**
          * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -9924,7 +9154,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__NAME = eINSTANCE.getTSubDataObject_Name();
+        EAttribute SUB_DATA_OBJECT__NAME = eINSTANCE.getSubDataObject_Name();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond</b></em>' attribute feature.
@@ -9932,7 +9162,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__PRES_COND = eINSTANCE.getTSubDataObject_PresCond();
+        EAttribute SUB_DATA_OBJECT__PRES_COND = eINSTANCE.getSubDataObject_PresCond();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args</b></em>' attribute feature.
@@ -9940,7 +9170,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__PRES_COND_ARGS = eINSTANCE.getTSubDataObject_PresCondArgs();
+        EAttribute SUB_DATA_OBJECT__PRES_COND_ARGS = eINSTANCE.getSubDataObject_PresCondArgs();
 
         /**
          * The meta object literal for the '<em><b>Pres Cond Args ID</b></em>' attribute feature.
@@ -9948,7 +9178,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__PRES_COND_ARGS_ID = eINSTANCE.getTSubDataObject_PresCondArgsID();
+        EAttribute SUB_DATA_OBJECT__PRES_COND_ARGS_ID = eINSTANCE.getSubDataObject_PresCondArgsID();
 
         /**
          * The meta object literal for the '<em><b>Size Attribute</b></em>' attribute feature.
@@ -9956,7 +9186,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__SIZE_ATTRIBUTE = eINSTANCE.getTSubDataObject_SizeAttribute();
+        EAttribute SUB_DATA_OBJECT__SIZE_ATTRIBUTE = eINSTANCE.getSubDataObject_SizeAttribute();
 
         /**
          * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
@@ -9964,7 +9194,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__TYPE = eINSTANCE.getTSubDataObject_Type();
+        EAttribute SUB_DATA_OBJECT__TYPE = eINSTANCE.getSubDataObject_Type();
 
         /**
          * The meta object literal for the '<em><b>Underlying Type</b></em>' attribute feature.
@@ -9972,7 +9202,7 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__UNDERLYING_TYPE = eINSTANCE.getTSubDataObject_UnderlyingType();
+        EAttribute SUB_DATA_OBJECT__UNDERLYING_TYPE = eINSTANCE.getSubDataObject_UnderlyingType();
 
         /**
          * The meta object literal for the '<em><b>Underlying Type Kind</b></em>' attribute feature.
@@ -9980,17 +9210,17 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND = eINSTANCE.getTSubDataObject_UnderlyingTypeKind();
+        EAttribute SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND = eINSTANCE.getSubDataObject_UnderlyingTypeKind();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TTitledClassImpl <em>TTitled Class</em>}' class.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TitledClassImpl <em>Titled Class</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TTitledClassImpl
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTTitledClass()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TitledClassImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTitledClass()
          * @generated
          */
-        EClass TTITLED_CLASS = eINSTANCE.getTTitledClass();
+        EClass TITLED_CLASS = eINSTANCE.getTitledClass();
 
         /**
          * The meta object literal for the '<em><b>Title ID</b></em>' attribute feature.
@@ -9998,375 +9228,163 @@ public interface NsdPackage extends EPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TTITLED_CLASS__TITLE_ID = eINSTANCE.getTTitledClass_TitleID();
+        EAttribute TITLED_CLASS__TITLE_ID = eINSTANCE.getTitledClass_TitleID();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind <em>TACSI Services Kind</em>}' enum.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDObjectWithVersionAndReleaseImpl <em>NSD Object With Version And Release</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTACSIServicesKind()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDObjectWithVersionAndReleaseImpl
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getNSDObjectWithVersionAndRelease()
          * @generated
          */
-        EEnum TACSI_SERVICES_KIND = eINSTANCE.getTACSIServicesKind();
+        EClass NSD_OBJECT_WITH_VERSION_AND_RELEASE = eINSTANCE.getNSDObjectWithVersionAndRelease();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind <em>TCB Kind</em>}' enum.
+         * The meta object literal for the '<em><b>Release</b></em>' attribute feature.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCBKind()
          * @generated
          */
-        EEnum TCB_KIND = eINSTANCE.getTCBKind();
+        EAttribute NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE = eINSTANCE.getNSDObjectWithVersionAndRelease_Release();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind <em>TDefined Attribute Type Kind</em>}' enum.
+         * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDefinedAttributeTypeKind()
          * @generated
          */
-        EEnum TDEFINED_ATTRIBUTE_TYPE_KIND = eINSTANCE.getTDefinedAttributeTypeKind();
+        EAttribute NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION = eINSTANCE.getNSDObjectWithVersionAndRelease_Version();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind <em>TLicense Kind</em>}' enum.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind <em>ACSI Services Kind</em>}' enum.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLicenseKind()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getACSIServicesKind()
          * @generated
          */
-        EEnum TLICENSE_KIND = eINSTANCE.getTLicenseKind();
+        EEnum ACSI_SERVICES_KIND = eINSTANCE.getACSIServicesKind();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage <em>TPub Stage</em>}' enum.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind <em>CB Kind</em>}' enum.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPubStage()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCBKind()
          * @generated
          */
-        EEnum TPUB_STAGE = eINSTANCE.getTPubStage();
+        EEnum CB_KIND = eINSTANCE.getCBKind();
 
         /**
-         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind <em>TUndefined Attribute Type Kind</em>}' enum.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind <em>Defined Attribute Type Kind</em>}' enum.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTUndefinedAttributeTypeKind()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDefinedAttributeTypeKind()
          * @generated
          */
-        EEnum TUNDEFINED_ATTRIBUTE_TYPE_KIND = eINSTANCE.getTUndefinedAttributeTypeKind();
+        EEnum DEFINED_ATTRIBUTE_TYPE_KIND = eINSTANCE.getDefinedAttributeTypeKind();
 
         /**
-         * The meta object literal for the '<em>TAbbreviation Name</em>' data type.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind <em>License Kind</em>}' enum.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbbreviationName()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLicenseKind()
          * @generated
          */
-        EDataType TABBREVIATION_NAME = eINSTANCE.getTAbbreviationName();
+        EEnum LICENSE_KIND = eINSTANCE.getLicenseKind();
 
         /**
-         * The meta object literal for the '<em>TAbstract LN Class Name</em>' data type.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage <em>Pub Stage</em>}' enum.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAbstractLNClassName()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getPubStage()
          * @generated
          */
-        EDataType TABSTRACT_LN_CLASS_NAME = eINSTANCE.getTAbstractLNClassName();
+        EEnum PUB_STAGE = eINSTANCE.getPubStage();
 
         /**
-         * The meta object literal for the '<em>TACSI Services Kind Object</em>' data type.
+         * The meta object literal for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind <em>Undefined Attribute Type Kind</em>}' enum.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTACSIServicesKindObject()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getUndefinedAttributeTypeKind()
          * @generated
          */
-        EDataType TACSI_SERVICES_KIND_OBJECT = eINSTANCE.getTACSIServicesKindObject();
+        EEnum UNDEFINED_ATTRIBUTE_TYPE_KIND = eINSTANCE.getUndefinedAttributeTypeKind();
 
         /**
-         * The meta object literal for the '<em>TAttribute Name</em>' data type.
+         * The meta object literal for the '<em>ACSI Services Kind Object</em>' data type.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAttributeName()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getACSIServicesKindObject()
          * @generated
          */
-        EDataType TATTRIBUTE_NAME = eINSTANCE.getTAttributeName();
+        EDataType ACSI_SERVICES_KIND_OBJECT = eINSTANCE.getACSIServicesKindObject();
 
         /**
-         * The meta object literal for the '<em>TAttribute Type Kind</em>' data type.
+         * The meta object literal for the '<em>Attribute Type Kind</em>' data type.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @see org.eclipse.emf.common.util.Enumerator
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTAttributeTypeKind()
-         * @generated
-         */
-        EDataType TATTRIBUTE_TYPE_KIND = eINSTANCE.getTAttributeTypeKind();
-
-        /**
-         * The meta object literal for the '<em>TBasic Type Name</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTBasicTypeName()
-         * @generated
-         */
-        EDataType TBASIC_TYPE_NAME = eINSTANCE.getTBasicTypeName();
-
-        /**
-         * The meta object literal for the '<em>TCB Kind Object</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCBKindObject()
-         * @generated
-         */
-        EDataType TCB_KIND_OBJECT = eINSTANCE.getTCBKindObject();
-
-        /**
-         * The meta object literal for the '<em>TCDC Name</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTCDCName()
-         * @generated
-         */
-        EDataType TCDC_NAME = eINSTANCE.getTCDCName();
-
-        /**
-         * The meta object literal for the '<em>TData Object Name</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDataObjectName()
-         * @generated
-         */
-        EDataType TDATA_OBJECT_NAME = eINSTANCE.getTDataObjectName();
-
-        /**
-         * The meta object literal for the '<em>TDefined Attribute Type Kind Object</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDefinedAttributeTypeKindObject()
-         * @generated
-         */
-        EDataType TDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT = eINSTANCE.getTDefinedAttributeTypeKindObject();
-
-        /**
-         * The meta object literal for the '<em>TDoc ID</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTDocID()
-         * @generated
-         */
-        EDataType TDOC_ID = eINSTANCE.getTDocID();
-
-        /**
-         * The meta object literal for the '<em>TEmpty String</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTEmptyString()
-         * @generated
-         */
-        EDataType TEMPTY_STRING = eINSTANCE.getTEmptyString();
-
-        /**
-         * The meta object literal for the '<em>TFC Abbreviation</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTFCAbbreviation()
-         * @generated
-         */
-        EDataType TFC_ABBREVIATION = eINSTANCE.getTFCAbbreviation();
-
-        /**
-         * The meta object literal for the '<em>TIec61850 Name</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTIec61850Name()
-         * @generated
-         */
-        EDataType TIEC61850_NAME = eINSTANCE.getTIec61850Name();
-
-        /**
-         * The meta object literal for the '<em>TIec61850 Name String</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTIec61850NameString()
-         * @generated
-         */
-        EDataType TIEC61850_NAME_STRING = eINSTANCE.getTIec61850NameString();
-
-        /**
-         * The meta object literal for the '<em>Tissues Type</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTissuesType()
-         * @generated
-         */
-        EDataType TISSUES_TYPE = eINSTANCE.getTissuesType();
-
-        /**
-         * The meta object literal for the '<em>TLicense Kind Object</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLicenseKindObject()
-         * @generated
-         */
-        EDataType TLICENSE_KIND_OBJECT = eINSTANCE.getTLicenseKindObject();
-
-        /**
-         * The meta object literal for the '<em>TLiteral Name</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLiteralName()
-         * @generated
-         */
-        EDataType TLITERAL_NAME = eINSTANCE.getTLiteralName();
-
-        /**
-         * The meta object literal for the '<em>TLN Class Name</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTLNClassName()
-         * @generated
-         */
-        EDataType TLN_CLASS_NAME = eINSTANCE.getTLNClassName();
-
-        /**
-         * The meta object literal for the '<em>TNS Identifier</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSIdentifier()
-         * @generated
-         */
-        EDataType TNS_IDENTIFIER = eINSTANCE.getTNSIdentifier();
-
-        /**
-         * The meta object literal for the '<em>TNS Release</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSRelease()
-         * @generated
-         */
-        EDataType TNS_RELEASE = eINSTANCE.getTNSRelease();
-
-        /**
-         * The meta object literal for the '<em>TNS Release Object</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.Short
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSReleaseObject()
-         * @generated
-         */
-        EDataType TNS_RELEASE_OBJECT = eINSTANCE.getTNSReleaseObject();
-
-        /**
-         * The meta object literal for the '<em>TNS Revision</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSRevision()
-         * @generated
-         */
-        EDataType TNS_REVISION = eINSTANCE.getTNSRevision();
-
-        /**
-         * The meta object literal for the '<em>TNS Version</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSVersion()
-         * @generated
-         */
-        EDataType TNS_VERSION = eINSTANCE.getTNSVersion();
-
-        /**
-         * The meta object literal for the '<em>TNS Version Object</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.Integer
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTNSVersionObject()
-         * @generated
-         */
-        EDataType TNS_VERSION_OBJECT = eINSTANCE.getTNSVersionObject();
-
-        /**
-         * The meta object literal for the '<em>TPresence Condition Argument</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPresenceConditionArgument()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getAttributeTypeKind()
          * @generated
          */
-        EDataType TPRESENCE_CONDITION_ARGUMENT = eINSTANCE.getTPresenceConditionArgument();
+        EDataType ATTRIBUTE_TYPE_KIND = eINSTANCE.getAttributeTypeKind();
 
         /**
-         * The meta object literal for the '<em>TPresence Condition Name</em>' data type.
+         * The meta object literal for the '<em>CB Kind Object</em>' data type.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPresenceConditionName()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getCBKindObject()
          * @generated
          */
-        EDataType TPRESENCE_CONDITION_NAME = eINSTANCE.getTPresenceConditionName();
+        EDataType CB_KIND_OBJECT = eINSTANCE.getCBKindObject();
 
         /**
-         * The meta object literal for the '<em>TPub Stage Object</em>' data type.
+         * The meta object literal for the '<em>Defined Attribute Type Kind Object</em>' data type.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTPubStageObject()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getDefinedAttributeTypeKindObject()
          * @generated
          */
-        EDataType TPUB_STAGE_OBJECT = eINSTANCE.getTPubStageObject();
+        EDataType DEFINED_ATTRIBUTE_TYPE_KIND_OBJECT = eINSTANCE.getDefinedAttributeTypeKindObject();
 
         /**
-         * The meta object literal for the '<em>TSub Data Object Name</em>' data type.
+         * The meta object literal for the '<em>License Kind Object</em>' data type.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTSubDataObjectName()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getLicenseKindObject()
          * @generated
          */
-        EDataType TSUB_DATA_OBJECT_NAME = eINSTANCE.getTSubDataObjectName();
+        EDataType LICENSE_KIND_OBJECT = eINSTANCE.getLicenseKindObject();
 
         /**
-         * The meta object literal for the '<em>TUML Version</em>' data type.
+         * The meta object literal for the '<em>Pub Stage Object</em>' data type.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see java.lang.String
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTUMLVersion()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getPubStageObject()
          * @generated
          */
-        EDataType TUML_VERSION = eINSTANCE.getTUMLVersion();
+        EDataType PUB_STAGE_OBJECT = eINSTANCE.getPubStageObject();
 
         /**
-         * The meta object literal for the '<em>TUndefined Attribute Type Kind Object</em>' data type.
+         * The meta object literal for the '<em>Undefined Attribute Type Kind Object</em>' data type.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind
-         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getTUndefinedAttributeTypeKindObject()
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind
+         * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NsdPackageImpl#getUndefinedAttributeTypeKindObject()
          * @generated
          */
-        EDataType TUNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT = eINSTANCE.getTUndefinedAttributeTypeKindObject();
+        EDataType UNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT = eINSTANCE.getUndefinedAttributeTypeKindObject();
 
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TPresenceCondition.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PresenceCondition.java
similarity index 71%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TPresenceCondition.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PresenceCondition.java
index 0e0ee590cf8653b0b009864a34eae8b1aeca315c..e68314eb6eeed8f65c348880f7b7db58113456ad 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TPresenceCondition.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PresenceCondition.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TPresence Condition</b></em>'.
+ * A representation of the model object '<em><b>Presence Condition</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,17 +34,17 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getArgument <em>Argument</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getTitleID <em>Title ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getArgument <em>Argument</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getTitleID <em>Title ID</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTPresenceCondition()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getPresenceCondition()
  * @model extendedMetaData="name='tPresenceCondition' kind='empty'"
  * @generated
  */
-public interface TPresenceCondition extends EObject {
+public interface PresenceCondition extends EObject {
     /**
      * Returns the value of the '<em><b>Argument</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -54,15 +54,14 @@ public interface TPresenceCondition extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Argument</em>' attribute.
      * @see #setArgument(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTPresenceCondition_Argument()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionArgument"
-     *        extendedMetaData="kind='attribute' name='argument'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getPresenceCondition_Argument()
+     * @model extendedMetaData="kind='attribute' name='argument'"
      * @generated
      */
     String getArgument();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getArgument <em>Argument</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getArgument <em>Argument</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Argument</em>' attribute.
@@ -80,15 +79,14 @@ public interface TPresenceCondition extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Desc ID</em>' attribute.
      * @see #setDescID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTPresenceCondition_DescID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='descID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getPresenceCondition_DescID()
+     * @model extendedMetaData="kind='attribute' name='descID'"
      * @generated
      */
     String getDescID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getDescID <em>Desc ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getDescID <em>Desc ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Desc ID</em>' attribute.
@@ -106,15 +104,15 @@ public interface TPresenceCondition extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTPresenceCondition_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getPresenceCondition_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -132,15 +130,14 @@ public interface TPresenceCondition extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Title ID</em>' attribute.
      * @see #setTitleID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTPresenceCondition_TitleID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='titleID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getPresenceCondition_TitleID()
+     * @model extendedMetaData="kind='attribute' name='titleID'"
      * @generated
      */
     String getTitleID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition#getTitleID <em>Title ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getTitleID <em>Title ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Title ID</em>' attribute.
@@ -149,4 +146,4 @@ public interface TPresenceCondition extends EObject {
      */
     void setTitleID( String value );
 
-} // TPresenceCondition
+} // PresenceCondition
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TPresenceConditions.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PresenceConditions.java
similarity index 79%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TPresenceConditions.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PresenceConditions.java
index 375e0d4bc7bdd06c7a20a10010d086b7f1182459..79647cc860f59522ae0f6374d82a8e5504000f00 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TPresenceConditions.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PresenceConditions.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TPresence Conditions</b></em>'.
+ * A representation of the model object '<em><b>Presence Conditions</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,28 +36,28 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions#getPresenceCondition <em>Presence Condition</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions#getPresenceCondition <em>Presence Condition</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTPresenceConditions()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getPresenceConditions()
  * @model extendedMetaData="name='tPresenceConditions' kind='elementOnly'"
  * @generated
  */
-public interface TPresenceConditions extends EObject {
+public interface PresenceConditions extends EObject {
     /**
      * Returns the value of the '<em><b>Presence Condition</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Definition of a presence condition.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Presence Condition</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTPresenceConditions_PresenceCondition()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getPresenceConditions_PresenceCondition()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='PresenceCondition' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TPresenceCondition > getPresenceCondition();
+    EList< PresenceCondition > getPresenceCondition();
 
-} // TPresenceConditions
+} // PresenceConditions
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TPubStage.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PubStage.java
similarity index 89%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TPubStage.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PubStage.java
index 091951a66c9df472d20fea0301e82117a9e83c8e..2ae2421c957a3e29f50e9b0397aa8bdda35fd23c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TPubStage.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PubStage.java
@@ -27,17 +27,17 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>TPub Stage</b></em>',
+ * A representation of the literals of the enumeration '<em><b>Pub Stage</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * Publication stage of the namespace.
  * <!-- end-model-doc -->
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTPubStage()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getPubStage()
  * @model extendedMetaData="name='tPubStage'"
  * @generated
  */
-public enum TPubStage implements Enumerator {
+public enum PubStage implements Enumerator {
     /**
      * The '<em><b>WD</b></em>' literal object.
      * <!-- begin-user-doc -->
@@ -282,32 +282,32 @@ public enum TPubStage implements Enumerator {
     public static final int IS_VALUE = 8;
 
     /**
-     * An array of all the '<em><b>TPub Stage</b></em>' enumerators.
+     * An array of all the '<em><b>Pub Stage</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private static final TPubStage[] VALUES_ARRAY = new TPubStage[] { WD, CD, CDV, DTS, DTR, FDIS, TS, TR, IS, };
+    private static final PubStage[] VALUES_ARRAY = new PubStage[] { WD, CD, CDV, DTS, DTR, FDIS, TS, TR, IS, };
 
     /**
-     * A public read-only list of all the '<em><b>TPub Stage</b></em>' enumerators.
+     * A public read-only list of all the '<em><b>Pub Stage</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List< TPubStage > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
+    public static final List< PubStage > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
-     * Returns the '<em><b>TPub Stage</b></em>' literal with the specified literal value.
+     * Returns the '<em><b>Pub Stage</b></em>' literal with the specified literal value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param literal the literal.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TPubStage get( String literal ) {
+    public static PubStage get( String literal ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TPubStage result = VALUES_ARRAY[i];
+            PubStage result = VALUES_ARRAY[i];
             if( result.toString().equals( literal ) ) {
                 return result;
             }
@@ -316,16 +316,16 @@ public enum TPubStage implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TPub Stage</b></em>' literal with the specified name.
+     * Returns the '<em><b>Pub Stage</b></em>' literal with the specified name.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param name the name.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TPubStage getByName( String name ) {
+    public static PubStage getByName( String name ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TPubStage result = VALUES_ARRAY[i];
+            PubStage result = VALUES_ARRAY[i];
             if( result.getName().equals( name ) ) {
                 return result;
             }
@@ -334,14 +334,14 @@ public enum TPubStage implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TPub Stage</b></em>' literal with the specified integer value.
+     * Returns the '<em><b>Pub Stage</b></em>' literal with the specified integer value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the integer value.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TPubStage get( int value ) {
+    public static PubStage get( int value ) {
         switch( value ) {
         case WD_VALUE:
             return WD;
@@ -392,7 +392,7 @@ public enum TPubStage implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    private TPubStage( int value, String name, String literal ) {
+    private PubStage( int value, String name, String literal ) {
         this.value = value;
         this.name = name;
         this.literal = literal;
@@ -439,4 +439,4 @@ public enum TPubStage implements Enumerator {
         return literal;
     }
 
-} //TPubStage
+} //PubStage
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceCDC.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceCDC.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceCDC.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceCDC.java
index c9226b83b9d57b5c3aea2a54cf08fdee63653875..c65172fe14b8a8da46f32b792c811e5092626759 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceCDC.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceCDC.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService CDC</b></em>'.
+ * A representation of the model object '<em><b>Service CDC</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,31 +36,31 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getServiceDataAttribute <em>Service Data Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getCdc <em>Cdc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getVariant <em>Variant</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getServiceDataAttribute <em>Service Data Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getCdc <em>Cdc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getVariant <em>Variant</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceCDC()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceCDC()
  * @model extendedMetaData="name='tServiceCDC' kind='elementOnly'"
  * @generated
  */
-public interface TServiceCDC extends EObject {
+public interface ServiceCDC extends EObject {
     /**
      * Returns the value of the '<em><b>Service Data Attribute</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Data attribute to be used as service parameter.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service Data Attribute</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceCDC_ServiceDataAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceCDC_ServiceDataAttribute()
      * @model containment="true" required="true"
      *        extendedMetaData="kind='element' name='ServiceDataAttribute' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TServiceDataAttribute > getServiceDataAttribute();
+    EList< ServiceDataAttribute > getServiceDataAttribute();
 
     /**
      * Returns the value of the '<em><b>Cdc</b></em>' attribute.
@@ -71,15 +71,15 @@ public interface TServiceCDC extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Cdc</em>' attribute.
      * @see #setCdc(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceCDC_Cdc()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceCDC_Cdc()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='cdc'"
      * @generated
      */
     String getCdc();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getCdc <em>Cdc</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getCdc <em>Cdc</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Cdc</em>' attribute.
@@ -97,7 +97,7 @@ public interface TServiceCDC extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Variant</em>' attribute.
      * @see #setVariant(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceCDC_Variant()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceCDC_Variant()
      * @model dataType="org.eclipse.emf.ecore.xml.type.Token"
      *        extendedMetaData="kind='attribute' name='variant'"
      * @generated
@@ -105,7 +105,7 @@ public interface TServiceCDC extends EObject {
     String getVariant();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC#getVariant <em>Variant</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC#getVariant <em>Variant</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Variant</em>' attribute.
@@ -114,4 +114,4 @@ public interface TServiceCDC extends EObject {
      */
     void setVariant( String value );
 
-} // TServiceCDC
+} // ServiceCDC
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceCDCs.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceCDCs.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceCDCs.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceCDCs.java
index 10b512ae886fd5fe294b453853b51cf94c5abb6d..5852c6b3faa7a35e66392fe1d71bed9dc70ed6fd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceCDCs.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceCDCs.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService CD Cs</b></em>'.
+ * A representation of the model object '<em><b>Service CD Cs</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,28 +36,28 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs#getServiceCDC <em>Service CDC</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs#getServiceCDC <em>Service CDC</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceCDCs()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceCDCs()
  * @model extendedMetaData="name='tServiceCDCs' kind='elementOnly'"
  * @generated
  */
-public interface TServiceCDCs extends EObject {
+public interface ServiceCDCs extends EObject {
     /**
      * Returns the value of the '<em><b>Service CDC</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * CDC extensions for control in this service namespace.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service CDC</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceCDCs_ServiceCDC()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceCDCs_ServiceCDC()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ServiceCDC' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TServiceCDC > getServiceCDC();
+    EList< ServiceCDC > getServiceCDC();
 
-} // TServiceCDCs
+} // ServiceCDCs
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceConstructedAttribute.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceConstructedAttribute.java
similarity index 79%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceConstructedAttribute.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceConstructedAttribute.java
index 973c2d9fe3282eec9bb909648741ec4b4de27afd..3dc1987a469c9a785d946d7f642fb172885b635c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceConstructedAttribute.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceConstructedAttribute.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService Constructed Attribute</b></em>'.
+ * A representation of the model object '<em><b>Service Constructed Attribute</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -32,14 +32,14 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceConstructedAttribute()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceConstructedAttribute()
  * @model extendedMetaData="name='tServiceConstructedAttribute' kind='elementOnly'"
  * @generated
  */
-public interface TServiceConstructedAttribute extends TConstructedAttribute {
+public interface ServiceConstructedAttribute extends ConstructedAttribute {
     /**
      * Returns the value of the '<em><b>Type Kind Parameterized</b></em>' attribute.
      * The default value is <code>"false"</code>.
@@ -52,7 +52,7 @@ public interface TServiceConstructedAttribute extends TConstructedAttribute {
      * @see #isSetTypeKindParameterized()
      * @see #unsetTypeKindParameterized()
      * @see #setTypeKindParameterized(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceConstructedAttribute_TypeKindParameterized()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceConstructedAttribute_TypeKindParameterized()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='typeKindParameterized'"
      * @generated
@@ -60,7 +60,7 @@ public interface TServiceConstructedAttribute extends TConstructedAttribute {
     boolean isTypeKindParameterized();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type Kind Parameterized</em>' attribute.
@@ -72,7 +72,7 @@ public interface TServiceConstructedAttribute extends TConstructedAttribute {
     void setTypeKindParameterized( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetTypeKindParameterized()
@@ -83,7 +83,7 @@ public interface TServiceConstructedAttribute extends TConstructedAttribute {
     void unsetTypeKindParameterized();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute#isTypeKindParameterized <em>Type Kind Parameterized</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Type Kind Parameterized</em>' attribute is set.
@@ -94,4 +94,4 @@ public interface TServiceConstructedAttribute extends TConstructedAttribute {
      */
     boolean isSetTypeKindParameterized();
 
-} // TServiceConstructedAttribute
+} // ServiceConstructedAttribute
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceConstructedAttributes.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceConstructedAttributes.java
similarity index 76%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceConstructedAttributes.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceConstructedAttributes.java
index e8f40cfd2571841d9a16ac0379b11948c4274e59..4ee087ea25557162a08d9614d467b9e2a283883d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceConstructedAttributes.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceConstructedAttributes.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService Constructed Attributes</b></em>'.
+ * A representation of the model object '<em><b>Service Constructed Attributes</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,28 +36,28 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes#getServiceConstructedAttribute <em>Service Constructed Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes#getServiceConstructedAttribute <em>Service Constructed Attribute</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceConstructedAttributes()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceConstructedAttributes()
  * @model extendedMetaData="name='tServiceConstructedAttributes' kind='elementOnly'"
  * @generated
  */
-public interface TServiceConstructedAttributes extends EObject {
+public interface ServiceConstructedAttributes extends EObject {
     /**
      * Returns the value of the '<em><b>Service Constructed Attribute</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Realization of Part 7-2 abstract types or constructed attributes needed for control services. Note: in SCL instance files, the ProtNs element shall be specified for these.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service Constructed Attribute</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceConstructedAttributes_ServiceConstructedAttribute()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceConstructedAttributes_ServiceConstructedAttribute()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ServiceConstructedAttribute' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TServiceConstructedAttribute > getServiceConstructedAttribute();
+    EList< ServiceConstructedAttribute > getServiceConstructedAttribute();
 
-} // TServiceConstructedAttributes
+} // ServiceConstructedAttributes
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceDataAttribute.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceDataAttribute.java
similarity index 70%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceDataAttribute.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceDataAttribute.java
index 106bccba806f03ab1c6becd4fdff80646ef3b3ba..5f14544c735872c13b331ff29894a5aa3546d90c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceDataAttribute.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceDataAttribute.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService Data Attribute</b></em>'.
+ * A representation of the model object '<em><b>Service Data Attribute</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,22 +34,22 @@ import org.eclipse.emf.common.util.Enumerator;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getFc <em>Fc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getTypeKind <em>Type Kind</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingType <em>Underlying Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getFc <em>Fc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingType <em>Underlying Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute()
  * @model extendedMetaData="name='tServiceDataAttribute' kind='empty'"
  * @generated
  */
-public interface TServiceDataAttribute extends TDocumentedClass {
+public interface ServiceDataAttribute extends DocumentedClass {
     /**
      * Returns the value of the '<em><b>Fc</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -59,15 +59,15 @@ public interface TServiceDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Fc</em>' attribute.
      * @see #setFc(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute_Fc()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFCAbbreviation" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute_Fc()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='fc'"
      * @generated
      */
     String getFc();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getFc <em>Fc</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getFc <em>Fc</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Fc</em>' attribute.
@@ -85,15 +85,15 @@ public interface TServiceDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -114,15 +114,15 @@ public interface TServiceDataAttribute extends TDocumentedClass {
      * @see #isSetPresCond()
      * @see #unsetPresCond()
      * @see #setPresCond(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute_PresCond()
-     * @model default="M" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionName"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute_PresCond()
+     * @model default="M" unsettable="true"
      *        extendedMetaData="kind='attribute' name='presCond'"
      * @generated
      */
     String getPresCond();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond</em>' attribute.
@@ -134,7 +134,7 @@ public interface TServiceDataAttribute extends TDocumentedClass {
     void setPresCond( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetPresCond()
@@ -145,7 +145,7 @@ public interface TServiceDataAttribute extends TDocumentedClass {
     void unsetPresCond();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCond <em>Pres Cond</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCond <em>Pres Cond</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Pres Cond</em>' attribute is set.
@@ -165,15 +165,14 @@ public interface TServiceDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args</em>' attribute.
      * @see #setPresCondArgs(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute_PresCondArgs()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionArgument"
-     *        extendedMetaData="kind='attribute' name='presCondArgs'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute_PresCondArgs()
+     * @model extendedMetaData="kind='attribute' name='presCondArgs'"
      * @generated
      */
     String getPresCondArgs();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args</em>' attribute.
@@ -191,15 +190,14 @@ public interface TServiceDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args ID</em>' attribute.
      * @see #setPresCondArgsID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute_PresCondArgsID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='presCondArgsID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute_PresCondArgsID()
+     * @model extendedMetaData="kind='attribute' name='presCondArgsID'"
      * @generated
      */
     String getPresCondArgsID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args ID</em>' attribute.
@@ -217,15 +215,14 @@ public interface TServiceDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Type</em>' attribute.
      * @see #setType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute_Type()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name"
-     *        extendedMetaData="kind='attribute' name='type'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute_Type()
+     * @model extendedMetaData="kind='attribute' name='type'"
      * @generated
      */
     String getType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getType <em>Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getType <em>Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type</em>' attribute.
@@ -246,15 +243,15 @@ public interface TServiceDataAttribute extends TDocumentedClass {
      * @see #isSetTypeKind()
      * @see #unsetTypeKind()
      * @see #setTypeKind(Enumerator)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute_TypeKind()
-     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeTypeKind"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute_TypeKind()
+     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.AttributeTypeKind"
      *        extendedMetaData="kind='attribute' name='typeKind'"
      * @generated
      */
     Enumerator getTypeKind();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type Kind</em>' attribute.
@@ -266,7 +263,7 @@ public interface TServiceDataAttribute extends TDocumentedClass {
     void setTypeKind( Enumerator value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetTypeKind()
@@ -277,7 +274,7 @@ public interface TServiceDataAttribute extends TDocumentedClass {
     void unsetTypeKind();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getTypeKind <em>Type Kind</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getTypeKind <em>Type Kind</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Type Kind</em>' attribute is set.
@@ -297,15 +294,14 @@ public interface TServiceDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Underlying Type</em>' attribute.
      * @see #setUnderlyingType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute_UnderlyingType()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name"
-     *        extendedMetaData="kind='attribute' name='underlyingType'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute_UnderlyingType()
+     * @model extendedMetaData="kind='attribute' name='underlyingType'"
      * @generated
      */
     String getUnderlyingType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingType <em>Underlying Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingType <em>Underlying Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Underlying Type</em>' attribute.
@@ -316,58 +312,58 @@ public interface TServiceDataAttribute extends TDocumentedClass {
 
     /**
      * Returns the value of the '<em><b>Underlying Type Kind</b></em>' attribute.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * The typeKind to be used for all "undefined" attributes of the CDC of this DataObject.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Underlying Type Kind</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
      * @see #isSetUnderlyingTypeKind()
      * @see #unsetUnderlyingTypeKind()
-     * @see #setUnderlyingTypeKind(TDefinedAttributeTypeKind)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceDataAttribute_UnderlyingTypeKind()
+     * @see #setUnderlyingTypeKind(DefinedAttributeTypeKind)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceDataAttribute_UnderlyingTypeKind()
      * @model unsettable="true"
      *        extendedMetaData="kind='attribute' name='underlyingTypeKind'"
      * @generated
      */
-    TDefinedAttributeTypeKind getUnderlyingTypeKind();
+    DefinedAttributeTypeKind getUnderlyingTypeKind();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Underlying Type Kind</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
      * @see #isSetUnderlyingTypeKind()
      * @see #unsetUnderlyingTypeKind()
      * @see #getUnderlyingTypeKind()
      * @generated
      */
-    void setUnderlyingTypeKind( TDefinedAttributeTypeKind value );
+    void setUnderlyingTypeKind( DefinedAttributeTypeKind value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetUnderlyingTypeKind()
      * @see #getUnderlyingTypeKind()
-     * @see #setUnderlyingTypeKind(TDefinedAttributeTypeKind)
+     * @see #setUnderlyingTypeKind(DefinedAttributeTypeKind)
      * @generated
      */
     void unsetUnderlyingTypeKind();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Underlying Type Kind</em>' attribute is set.
      * @see #unsetUnderlyingTypeKind()
      * @see #getUnderlyingTypeKind()
-     * @see #setUnderlyingTypeKind(TDefinedAttributeTypeKind)
+     * @see #setUnderlyingTypeKind(DefinedAttributeTypeKind)
      * @generated
      */
     boolean isSetUnderlyingTypeKind();
 
-} // TServiceDataAttribute
+} // ServiceDataAttribute
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceNS.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceNS.java
similarity index 60%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceNS.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceNS.java
index 54819d824c68c2c6b78880920ae9fdccd0d06b2b..b2515ef053a984206c17e56675e50ea1fa3bfd97 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceNS.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceNS.java
@@ -23,7 +23,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService NS</b></em>'.
+ * A representation of the model object '<em><b>Service NS</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -34,28 +34,26 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getChanges <em>Changes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getFunctionalConstraints <em>Functional Constraints</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPresenceConditions <em>Presence Conditions</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getAbbreviations <em>Abbreviations</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceTypeRealizations <em>Service Type Realizations</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceConstructedAttributes <em>Service Constructed Attributes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceCDCs <em>Service CD Cs</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getId <em>Id</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getUmlDate <em>Uml Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getUmlVersion <em>Uml Version</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getChanges <em>Changes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getFunctionalConstraints <em>Functional Constraints</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPresenceConditions <em>Presence Conditions</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getAbbreviations <em>Abbreviations</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceTypeRealizations <em>Service Type Realizations</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceConstructedAttributes <em>Service Constructed Attributes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceCDCs <em>Service CD Cs</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPublicationStage <em>Publication Stage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getRevision <em>Revision</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getUmlDate <em>Uml Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getUmlVersion <em>Uml Version</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS()
  * @model extendedMetaData="name='tServiceNS' kind='elementOnly'"
  * @generated
  */
-public interface TServiceNS extends TCopyrighted {
+public interface ServiceNS extends Copyrighted, NSDObjectWithVersionAndRelease {
     /**
      * Returns the value of the '<em><b>Changes</b></em>' containment reference.
      * <!-- begin-user-doc -->
@@ -64,23 +62,23 @@ public interface TServiceNS extends TCopyrighted {
      * The version/revision/release this namespace is based on, including the TISSUEs implemented in this release.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Changes</em>' containment reference.
-     * @see #setChanges(TChanges)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_Changes()
+     * @see #setChanges(Changes)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_Changes()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='Changes' namespace='##targetNamespace'"
      * @generated
      */
-    TChanges getChanges();
+    Changes getChanges();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getChanges <em>Changes</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getChanges <em>Changes</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Changes</em>' containment reference.
      * @see #getChanges()
      * @generated
      */
-    void setChanges( TChanges value );
+    void setChanges( Changes value );
 
     /**
      * Returns the value of the '<em><b>Functional Constraints</b></em>' containment reference.
@@ -90,23 +88,23 @@ public interface TServiceNS extends TCopyrighted {
      * List of Functional Constraints added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine "included" ones.).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Functional Constraints</em>' containment reference.
-     * @see #setFunctionalConstraints(TFunctionalConstraints)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_FunctionalConstraints()
+     * @see #setFunctionalConstraints(FunctionalConstraints)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_FunctionalConstraints()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='FunctionalConstraints' namespace='##targetNamespace'"
      * @generated
      */
-    TFunctionalConstraints getFunctionalConstraints();
+    FunctionalConstraints getFunctionalConstraints();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getFunctionalConstraints <em>Functional Constraints</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getFunctionalConstraints <em>Functional Constraints</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Functional Constraints</em>' containment reference.
      * @see #getFunctionalConstraints()
      * @generated
      */
-    void setFunctionalConstraints( TFunctionalConstraints value );
+    void setFunctionalConstraints( FunctionalConstraints value );
 
     /**
      * Returns the value of the '<em><b>Presence Conditions</b></em>' containment reference.
@@ -116,23 +114,23 @@ public interface TServiceNS extends TCopyrighted {
      * List of presence conditions added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine "included" ones.).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Presence Conditions</em>' containment reference.
-     * @see #setPresenceConditions(TPresenceConditions)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_PresenceConditions()
+     * @see #setPresenceConditions(PresenceConditions)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_PresenceConditions()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='PresenceConditions' namespace='##targetNamespace'"
      * @generated
      */
-    TPresenceConditions getPresenceConditions();
+    PresenceConditions getPresenceConditions();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPresenceConditions <em>Presence Conditions</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPresenceConditions <em>Presence Conditions</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Presence Conditions</em>' containment reference.
      * @see #getPresenceConditions()
      * @generated
      */
-    void setPresenceConditions( TPresenceConditions value );
+    void setPresenceConditions( PresenceConditions value );
 
     /**
      * Returns the value of the '<em><b>Abbreviations</b></em>' containment reference.
@@ -142,23 +140,23 @@ public interface TServiceNS extends TCopyrighted {
      * List of abbreviations added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine "included" ones.).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Abbreviations</em>' containment reference.
-     * @see #setAbbreviations(TAbbreviations)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_Abbreviations()
+     * @see #setAbbreviations(Abbreviations)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_Abbreviations()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='Abbreviations' namespace='##targetNamespace'"
      * @generated
      */
-    TAbbreviations getAbbreviations();
+    Abbreviations getAbbreviations();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getAbbreviations <em>Abbreviations</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getAbbreviations <em>Abbreviations</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Abbreviations</em>' containment reference.
      * @see #getAbbreviations()
      * @generated
      */
-    void setAbbreviations( TAbbreviations value );
+    void setAbbreviations( Abbreviations value );
 
     /**
      * Returns the value of the '<em><b>Service Type Realizations</b></em>' containment reference.
@@ -168,23 +166,23 @@ public interface TServiceNS extends TCopyrighted {
      * List of service type realization added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine "included" ones.).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service Type Realizations</em>' containment reference.
-     * @see #setServiceTypeRealizations(TServiceTypeRealizations)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_ServiceTypeRealizations()
+     * @see #setServiceTypeRealizations(ServiceTypeRealizations)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_ServiceTypeRealizations()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ServiceTypeRealizations' namespace='##targetNamespace'"
      * @generated
      */
-    TServiceTypeRealizations getServiceTypeRealizations();
+    ServiceTypeRealizations getServiceTypeRealizations();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceTypeRealizations <em>Service Type Realizations</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceTypeRealizations <em>Service Type Realizations</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Service Type Realizations</em>' containment reference.
      * @see #getServiceTypeRealizations()
      * @generated
      */
-    void setServiceTypeRealizations( TServiceTypeRealizations value );
+    void setServiceTypeRealizations( ServiceTypeRealizations value );
 
     /**
      * Returns the value of the '<em><b>Service Constructed Attributes</b></em>' containment reference.
@@ -194,23 +192,23 @@ public interface TServiceNS extends TCopyrighted {
      * List of service constructed attributes added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine "included" ones.).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service Constructed Attributes</em>' containment reference.
-     * @see #setServiceConstructedAttributes(TServiceConstructedAttributes)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_ServiceConstructedAttributes()
+     * @see #setServiceConstructedAttributes(ServiceConstructedAttributes)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_ServiceConstructedAttributes()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ServiceConstructedAttributes' namespace='##targetNamespace'"
      * @generated
      */
-    TServiceConstructedAttributes getServiceConstructedAttributes();
+    ServiceConstructedAttributes getServiceConstructedAttributes();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceConstructedAttributes <em>Service Constructed Attributes</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceConstructedAttributes <em>Service Constructed Attributes</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Service Constructed Attributes</em>' containment reference.
      * @see #getServiceConstructedAttributes()
      * @generated
      */
-    void setServiceConstructedAttributes( TServiceConstructedAttributes value );
+    void setServiceConstructedAttributes( ServiceConstructedAttributes value );
 
     /**
      * Returns the value of the '<em><b>Service CD Cs</b></em>' containment reference.
@@ -220,23 +218,23 @@ public interface TServiceNS extends TCopyrighted {
      * List of service CDCs added by this namespace. Is cumulative to those defined in namespaces this one needs (may not redefine "included" ones.).
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service CD Cs</em>' containment reference.
-     * @see #setServiceCDCs(TServiceCDCs)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_ServiceCDCs()
+     * @see #setServiceCDCs(ServiceCDCs)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_ServiceCDCs()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ServiceCDCs' namespace='##targetNamespace'"
      * @generated
      */
-    TServiceCDCs getServiceCDCs();
+    ServiceCDCs getServiceCDCs();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getServiceCDCs <em>Service CD Cs</em>}' containment reference.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getServiceCDCs <em>Service CD Cs</em>}' containment reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Service CD Cs</em>' containment reference.
      * @see #getServiceCDCs()
      * @generated
      */
-    void setServiceCDCs( TServiceCDCs value );
+    void setServiceCDCs( ServiceCDCs value );
 
     /**
      * Returns the value of the '<em><b>Desc ID</b></em>' attribute.
@@ -247,15 +245,14 @@ public interface TServiceNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Desc ID</em>' attribute.
      * @see #setDescID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_DescID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='descID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_DescID()
+     * @model extendedMetaData="kind='attribute' name='descID'"
      * @generated
      */
     String getDescID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getDescID <em>Desc ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getDescID <em>Desc ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Desc ID</em>' attribute.
@@ -273,15 +270,15 @@ public interface TServiceNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Id</em>' attribute.
      * @see #setId(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_Id()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSIdentifier" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_Id()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='id'"
      * @generated
      */
     String getId();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getId <em>Id</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getId <em>Id</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Id</em>' attribute.
@@ -293,114 +290,60 @@ public interface TServiceNS extends TCopyrighted {
     /**
      * Returns the value of the '<em><b>Publication Stage</b></em>' attribute.
      * The default value is <code>"IS"</code>.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * The publication stage of the namespace, by default IS.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
-     * @see #setPublicationStage(TPubStage)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_PublicationStage()
+     * @see #setPublicationStage(PubStage)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_PublicationStage()
      * @model default="IS" unsettable="true"
      *        extendedMetaData="kind='attribute' name='publicationStage'"
      * @generated
      */
-    TPubStage getPublicationStage();
+    PubStage getPublicationStage();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPublicationStage <em>Publication Stage</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPublicationStage <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
      * @see #isSetPublicationStage()
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
      * @generated
      */
-    void setPublicationStage( TPubStage value );
+    void setPublicationStage( PubStage value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPublicationStage <em>Publication Stage</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPublicationStage <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     void unsetPublicationStage();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getPublicationStage <em>Publication Stage</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getPublicationStage <em>Publication Stage</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Publication Stage</em>' attribute is set.
      * @see #unsetPublicationStage()
      * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
+     * @see #setPublicationStage(PubStage)
      * @generated
      */
     boolean isSetPublicationStage();
 
-    /**
-     * Returns the value of the '<em><b>Release</b></em>' attribute.
-     * The default value is <code>"1"</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Release of the namespace version and revision, by default 1.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #setRelease(short)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_Release()
-     * @model default="1" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRelease"
-     *        extendedMetaData="kind='attribute' name='release'"
-     * @generated
-     */
-    short getRelease();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @generated
-     */
-    void setRelease( short value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    void unsetRelease();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRelease <em>Release</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Release</em>' attribute is set.
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    boolean isSetRelease();
-
     /**
      * Returns the value of the '<em><b>Revision</b></em>' attribute.
      * The default value is <code>"A"</code>.
@@ -413,15 +356,15 @@ public interface TServiceNS extends TCopyrighted {
      * @see #isSetRevision()
      * @see #unsetRevision()
      * @see #setRevision(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_Revision()
-     * @model default="A" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRevision"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_Revision()
+     * @model default="A" unsettable="true"
      *        extendedMetaData="kind='attribute' name='revision'"
      * @generated
      */
     String getRevision();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRevision <em>Revision</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getRevision <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Revision</em>' attribute.
@@ -433,7 +376,7 @@ public interface TServiceNS extends TCopyrighted {
     void setRevision( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRevision <em>Revision</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getRevision <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetRevision()
@@ -444,7 +387,7 @@ public interface TServiceNS extends TCopyrighted {
     void unsetRevision();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getRevision <em>Revision</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getRevision <em>Revision</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Revision</em>' attribute is set.
@@ -465,7 +408,7 @@ public interface TServiceNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Uml Date</em>' attribute.
      * @see #setUmlDate(XMLGregorianCalendar)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_UmlDate()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_UmlDate()
      * @model dataType="org.eclipse.emf.ecore.xml.type.DateTime"
      *        extendedMetaData="kind='attribute' name='umlDate'"
      * @generated
@@ -473,7 +416,7 @@ public interface TServiceNS extends TCopyrighted {
     XMLGregorianCalendar getUmlDate();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getUmlDate <em>Uml Date</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getUmlDate <em>Uml Date</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Uml Date</em>' attribute.
@@ -491,15 +434,14 @@ public interface TServiceNS extends TCopyrighted {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Uml Version</em>' attribute.
      * @see #setUmlVersion(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_UmlVersion()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUMLVersion"
-     *        extendedMetaData="kind='attribute' name='umlVersion'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNS_UmlVersion()
+     * @model extendedMetaData="kind='attribute' name='umlVersion'"
      * @generated
      */
     String getUmlVersion();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getUmlVersion <em>Uml Version</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS#getUmlVersion <em>Uml Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Uml Version</em>' attribute.
@@ -508,57 +450,4 @@ public interface TServiceNS extends TCopyrighted {
      */
     void setUmlVersion( String value );
 
-    /**
-     * Returns the value of the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Version (year) of the namespace.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #setVersion(int)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNS_Version()
-     * @model unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSVersion" required="true"
-     *        extendedMetaData="kind='attribute' name='version'"
-     * @generated
-     */
-    int getVersion();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @generated
-     */
-    void setVersion( int value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    void unsetVersion();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS#getVersion <em>Version</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Version</em>' attribute is set.
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    boolean isSetVersion();
-
-} // TServiceNS
+} // ServiceNS
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceNsUsage.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceNsUsage.java
new file mode 100644
index 0000000000000000000000000000000000000000..82b543bcf28034813102bcb77ed4e42cd018d462
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceNsUsage.java
@@ -0,0 +1,201 @@
+/**
+ *  Copyright (c) 2019 CentraleSupélec & EDF.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ * 
+ */
+package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Service Ns Usage</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Describes the list of (domain) NS for which a ServiceNS is applicable.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getAppliesTo <em>Applies To</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getPublicationStage <em>Publication Stage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getRevision <em>Revision</em>}</li>
+ * </ul>
+ *
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNsUsage()
+ * @model extendedMetaData="name='tServiceNsUsage' kind='elementOnly'"
+ * @generated
+ */
+public interface ServiceNsUsage extends NSDObjectWithVersionAndRelease {
+    /**
+     * Returns the value of the '<em><b>Applies To</b></em>' containment reference list.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * References to namespaces this ServiceNS can be used with.
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Applies To</em>' containment reference list.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNsUsage_AppliesTo()
+     * @model containment="true" required="true"
+     *        extendedMetaData="kind='element' name='AppliesTo' namespace='##targetNamespace'"
+     * @generated
+     */
+    EList< AppliesToType > getAppliesTo();
+
+    /**
+     * Returns the value of the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * Identifier of the namespace, e.g., "IEC 61850-7-4", "(Tr)IEC 61850-90-4".
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Id</em>' attribute.
+     * @see #setId(String)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNsUsage_Id()
+     * @model required="true"
+     *        extendedMetaData="kind='attribute' name='id'"
+     * @generated
+     */
+    String getId();
+
+    /**
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getId <em>Id</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Id</em>' attribute.
+     * @see #getId()
+     * @generated
+     */
+    void setId( String value );
+
+    /**
+     * Returns the value of the '<em><b>Publication Stage</b></em>' attribute.
+     * The default value is <code>"IS"</code>.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * The publication stage of the namespace, by default IS.
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Publication Stage</em>' attribute.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
+     * @see #isSetPublicationStage()
+     * @see #unsetPublicationStage()
+     * @see #setPublicationStage(PubStage)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNsUsage_PublicationStage()
+     * @model default="IS" unsettable="true"
+     *        extendedMetaData="kind='attribute' name='publicationStage'"
+     * @generated
+     */
+    PubStage getPublicationStage();
+
+    /**
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getPublicationStage <em>Publication Stage</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Publication Stage</em>' attribute.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage
+     * @see #isSetPublicationStage()
+     * @see #unsetPublicationStage()
+     * @see #getPublicationStage()
+     * @generated
+     */
+    void setPublicationStage( PubStage value );
+
+    /**
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getPublicationStage <em>Publication Stage</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isSetPublicationStage()
+     * @see #getPublicationStage()
+     * @see #setPublicationStage(PubStage)
+     * @generated
+     */
+    void unsetPublicationStage();
+
+    /**
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getPublicationStage <em>Publication Stage</em>}' attribute is set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return whether the value of the '<em>Publication Stage</em>' attribute is set.
+     * @see #unsetPublicationStage()
+     * @see #getPublicationStage()
+     * @see #setPublicationStage(PubStage)
+     * @generated
+     */
+    boolean isSetPublicationStage();
+
+    /**
+     * Returns the value of the '<em><b>Revision</b></em>' attribute.
+     * The default value is <code>"A"</code>.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * Revision of the namespace version, by default 'A'.
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Revision</em>' attribute.
+     * @see #isSetRevision()
+     * @see #unsetRevision()
+     * @see #setRevision(String)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceNsUsage_Revision()
+     * @model default="A" unsettable="true"
+     *        extendedMetaData="kind='attribute' name='revision'"
+     * @generated
+     */
+    String getRevision();
+
+    /**
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getRevision <em>Revision</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Revision</em>' attribute.
+     * @see #isSetRevision()
+     * @see #unsetRevision()
+     * @see #getRevision()
+     * @generated
+     */
+    void setRevision( String value );
+
+    /**
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getRevision <em>Revision</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isSetRevision()
+     * @see #getRevision()
+     * @see #setRevision(String)
+     * @generated
+     */
+    void unsetRevision();
+
+    /**
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage#getRevision <em>Revision</em>}' attribute is set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return whether the value of the '<em>Revision</em>' attribute is set.
+     * @see #unsetRevision()
+     * @see #getRevision()
+     * @see #setRevision(String)
+     * @generated
+     */
+    boolean isSetRevision();
+
+} // ServiceNsUsage
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceParameter.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceParameter.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceParameter.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceParameter.java
index fa0ae59d5b746d6533362d5422edfcd1126f2462..6e4a36a8884a2459216b2fcf0ff5a7411febcfce 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceParameter.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceParameter.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService Parameter</b></em>'.
+ * A representation of the model object '<em><b>Service Parameter</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,19 +36,19 @@ import org.eclipse.emf.common.util.Enumerator;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getMaxValue <em>Max Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getMinValue <em>Min Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getDefaultValue <em>Default Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getMaxValue <em>Max Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getMinValue <em>Min Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getTypeKind <em>Type Kind</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceParameter()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceParameter()
  * @model extendedMetaData="name='tServiceParameter' kind='empty'"
  * @generated
  */
-public interface TServiceParameter extends TDocumentedClass {
+public interface ServiceParameter extends DocumentedClass {
     /**
      * Returns the value of the '<em><b>Default Value</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -58,7 +58,7 @@ public interface TServiceParameter extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Default Value</em>' attribute.
      * @see #setDefaultValue(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceParameter_DefaultValue()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceParameter_DefaultValue()
      * @model dataType="org.eclipse.emf.ecore.xml.type.NormalizedString"
      *        extendedMetaData="kind='attribute' name='defaultValue'"
      * @generated
@@ -66,7 +66,7 @@ public interface TServiceParameter extends TDocumentedClass {
     String getDefaultValue();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getDefaultValue <em>Default Value</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getDefaultValue <em>Default Value</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Default Value</em>' attribute.
@@ -84,7 +84,7 @@ public interface TServiceParameter extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Max Value</em>' attribute.
      * @see #setMaxValue(BigDecimal)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceParameter_MaxValue()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceParameter_MaxValue()
      * @model dataType="org.eclipse.emf.ecore.xml.type.Decimal"
      *        extendedMetaData="kind='attribute' name='maxValue'"
      * @generated
@@ -92,7 +92,7 @@ public interface TServiceParameter extends TDocumentedClass {
     BigDecimal getMaxValue();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getMaxValue <em>Max Value</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getMaxValue <em>Max Value</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Max Value</em>' attribute.
@@ -110,7 +110,7 @@ public interface TServiceParameter extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Min Value</em>' attribute.
      * @see #setMinValue(BigDecimal)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceParameter_MinValue()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceParameter_MinValue()
      * @model dataType="org.eclipse.emf.ecore.xml.type.Decimal"
      *        extendedMetaData="kind='attribute' name='minValue'"
      * @generated
@@ -118,7 +118,7 @@ public interface TServiceParameter extends TDocumentedClass {
     BigDecimal getMinValue();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getMinValue <em>Min Value</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getMinValue <em>Min Value</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Min Value</em>' attribute.
@@ -136,15 +136,15 @@ public interface TServiceParameter extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceParameter_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceParameter_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -162,15 +162,14 @@ public interface TServiceParameter extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Type</em>' attribute.
      * @see #setType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceParameter_Type()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name"
-     *        extendedMetaData="kind='attribute' name='type'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceParameter_Type()
+     * @model extendedMetaData="kind='attribute' name='type'"
      * @generated
      */
     String getType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getType <em>Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getType <em>Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type</em>' attribute.
@@ -191,15 +190,15 @@ public interface TServiceParameter extends TDocumentedClass {
      * @see #isSetTypeKind()
      * @see #unsetTypeKind()
      * @see #setTypeKind(Enumerator)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceParameter_TypeKind()
-     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeTypeKind"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceParameter_TypeKind()
+     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.AttributeTypeKind"
      *        extendedMetaData="kind='attribute' name='typeKind'"
      * @generated
      */
     Enumerator getTypeKind();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getTypeKind <em>Type Kind</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type Kind</em>' attribute.
@@ -211,7 +210,7 @@ public interface TServiceParameter extends TDocumentedClass {
     void setTypeKind( Enumerator value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getTypeKind <em>Type Kind</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetTypeKind()
@@ -222,7 +221,7 @@ public interface TServiceParameter extends TDocumentedClass {
     void unsetTypeKind();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter#getTypeKind <em>Type Kind</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter#getTypeKind <em>Type Kind</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Type Kind</em>' attribute is set.
@@ -233,4 +232,4 @@ public interface TServiceParameter extends TDocumentedClass {
      */
     boolean isSetTypeKind();
 
-} // TServiceParameter
+} // ServiceParameter
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceType.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceType.java
index 8c2f1db661a04c0441c5b62953a53d15474196ea..863d97ca11481f222a1abbd9399956e1771c2522 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceType.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceType.java
@@ -40,7 +40,7 @@ import org.eclipse.emf.ecore.EObject;
 public interface ServiceType extends EObject {
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind}.
      * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Name</em>' attribute isn't clear,
@@ -48,29 +48,29 @@ public interface ServiceType extends EObject {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Name</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind
      * @see #isSetName()
      * @see #unsetName()
-     * @see #setName(TACSIServicesKind)
+     * @see #setName(ACSIServicesKind)
      * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceType_Name()
      * @model unsettable="true" required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
-    TACSIServicesKind getName();
+    ACSIServicesKind getName();
 
     /**
      * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind
      * @see #isSetName()
      * @see #unsetName()
      * @see #getName()
      * @generated
      */
-    void setName( TACSIServicesKind value );
+    void setName( ACSIServicesKind value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType#getName <em>Name</em>}' attribute.
@@ -78,7 +78,7 @@ public interface ServiceType extends EObject {
      * <!-- end-user-doc -->
      * @see #isSetName()
      * @see #getName()
-     * @see #setName(TACSIServicesKind)
+     * @see #setName(ACSIServicesKind)
      * @generated
      */
     void unsetName();
@@ -90,7 +90,7 @@ public interface ServiceType extends EObject {
      * @return whether the value of the '<em>Name</em>' attribute is set.
      * @see #unsetName()
      * @see #getName()
-     * @see #setName(TACSIServicesKind)
+     * @see #setName(ACSIServicesKind)
      * @generated
      */
     boolean isSetName();
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceTypeRealization.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceTypeRealization.java
similarity index 73%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceTypeRealization.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceTypeRealization.java
index 254a4927f998d6fcc21a2a0b93077656d73693dc..59508a7457cb52a3ca7402313e6b129e06c209c8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceTypeRealization.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceTypeRealization.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService Type Realization</b></em>'.
+ * A representation of the model object '<em><b>Service Type Realization</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,20 +36,20 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getFc <em>Fc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getFc <em>Fc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getTypeKind <em>Type Kind</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealization()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealization()
  * @model extendedMetaData="name='tServiceTypeRealization' kind='empty'"
  * @generated
  */
-public interface TServiceTypeRealization extends EObject {
+public interface ServiceTypeRealization extends EObject {
     /**
      * Returns the value of the '<em><b>Fc</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -59,15 +59,15 @@ public interface TServiceTypeRealization extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Fc</em>' attribute.
      * @see #setFc(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealization_Fc()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFCAbbreviation" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealization_Fc()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='fc'"
      * @generated
      */
     String getFc();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getFc <em>Fc</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getFc <em>Fc</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Fc</em>' attribute.
@@ -85,15 +85,15 @@ public interface TServiceTypeRealization extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealization_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealization_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -114,15 +114,15 @@ public interface TServiceTypeRealization extends EObject {
      * @see #isSetPresCond()
      * @see #unsetPresCond()
      * @see #setPresCond(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealization_PresCond()
-     * @model default="M" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionName"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealization_PresCond()
+     * @model default="M" unsettable="true"
      *        extendedMetaData="kind='attribute' name='presCond'"
      * @generated
      */
     String getPresCond();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCond <em>Pres Cond</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond</em>' attribute.
@@ -134,7 +134,7 @@ public interface TServiceTypeRealization extends EObject {
     void setPresCond( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCond <em>Pres Cond</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetPresCond()
@@ -145,7 +145,7 @@ public interface TServiceTypeRealization extends EObject {
     void unsetPresCond();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCond <em>Pres Cond</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCond <em>Pres Cond</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Pres Cond</em>' attribute is set.
@@ -165,15 +165,14 @@ public interface TServiceTypeRealization extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args</em>' attribute.
      * @see #setPresCondArgs(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealization_PresCondArgs()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionArgument"
-     *        extendedMetaData="kind='attribute' name='presCondArgs'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealization_PresCondArgs()
+     * @model extendedMetaData="kind='attribute' name='presCondArgs'"
      * @generated
      */
     String getPresCondArgs();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args</em>' attribute.
@@ -191,15 +190,14 @@ public interface TServiceTypeRealization extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args ID</em>' attribute.
      * @see #setPresCondArgsID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealization_PresCondArgsID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='presCondArgsID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealization_PresCondArgsID()
+     * @model extendedMetaData="kind='attribute' name='presCondArgsID'"
      * @generated
      */
     String getPresCondArgsID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args ID</em>' attribute.
@@ -217,15 +215,14 @@ public interface TServiceTypeRealization extends EObject {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Type</em>' attribute.
      * @see #setType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealization_Type()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name"
-     *        extendedMetaData="kind='attribute' name='type'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealization_Type()
+     * @model extendedMetaData="kind='attribute' name='type'"
      * @generated
      */
     String getType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getType <em>Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getType <em>Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type</em>' attribute.
@@ -246,15 +243,15 @@ public interface TServiceTypeRealization extends EObject {
      * @see #isSetTypeKind()
      * @see #unsetTypeKind()
      * @see #setTypeKind(Enumerator)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealization_TypeKind()
-     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeTypeKind"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealization_TypeKind()
+     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.AttributeTypeKind"
      *        extendedMetaData="kind='attribute' name='typeKind'"
      * @generated
      */
     Enumerator getTypeKind();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getTypeKind <em>Type Kind</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type Kind</em>' attribute.
@@ -266,7 +263,7 @@ public interface TServiceTypeRealization extends EObject {
     void setTypeKind( Enumerator value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getTypeKind <em>Type Kind</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetTypeKind()
@@ -277,7 +274,7 @@ public interface TServiceTypeRealization extends EObject {
     void unsetTypeKind();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization#getTypeKind <em>Type Kind</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization#getTypeKind <em>Type Kind</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Type Kind</em>' attribute is set.
@@ -288,4 +285,4 @@ public interface TServiceTypeRealization extends EObject {
      */
     boolean isSetTypeKind();
 
-} // TServiceTypeRealization
+} // ServiceTypeRealization
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceTypeRealizations.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceTypeRealizations.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceTypeRealizations.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceTypeRealizations.java
index a5c18c13c345ec29f1b5176736a323bda19d44f9..8dc3230ac77fa9ddf65af360d951b7ad890e0e66 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceTypeRealizations.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ServiceTypeRealizations.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService Type Realizations</b></em>'.
+ * A representation of the model object '<em><b>Service Type Realizations</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,28 +36,28 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations#getServiceTypeRealization <em>Service Type Realization</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations#getServiceTypeRealization <em>Service Type Realization</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealizations()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealizations()
  * @model extendedMetaData="name='tServiceTypeRealizations' kind='elementOnly'"
  * @generated
  */
-public interface TServiceTypeRealizations extends EObject {
+public interface ServiceTypeRealizations extends EObject {
     /**
      * Returns the value of the '<em><b>Service Type Realization</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute}.
+     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * Realization of an abstract type as constructed attribute in the service namespace.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Service Type Realization</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceTypeRealizations_ServiceTypeRealization()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getServiceTypeRealizations_ServiceTypeRealization()
      * @model containment="true"
      *        extendedMetaData="kind='element' name='ServiceTypeRealization' namespace='##targetNamespace'"
      * @generated
      */
-    EList< TConstructedAttribute > getServiceTypeRealization();
+    EList< ConstructedAttribute > getServiceTypeRealization();
 
-} // TServiceTypeRealizations
+} // ServiceTypeRealizations
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TSubDataAttribute.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/SubDataAttribute.java
similarity index 76%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TSubDataAttribute.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/SubDataAttribute.java
index d24fa533ac02fab8f78caf05158e441d3ec1672b..d52fa1db8ec7572183283d63be26340ca282588f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TSubDataAttribute.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/SubDataAttribute.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TSub Data Attribute</b></em>'.
+ * A representation of the model object '<em><b>Sub Data Attribute</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -36,26 +36,26 @@ import org.eclipse.emf.common.util.Enumerator;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#isIsArray <em>Is Array</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMaxValue <em>Max Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinIndex <em>Min Index</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinValue <em>Min Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getSizeAttribute <em>Size Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getDefaultValue <em>Default Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#isIsArray <em>Is Array</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMaxValue <em>Max Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinIndex <em>Min Index</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinValue <em>Min Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getSizeAttribute <em>Size Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getTypeKind <em>Type Kind</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute()
  * @model extendedMetaData="name='tSubDataAttribute' kind='empty'"
  * @generated
  */
-public interface TSubDataAttribute extends TDocumentedClass {
+public interface SubDataAttribute extends DocumentedClass {
     /**
      * Returns the value of the '<em><b>Default Value</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -65,7 +65,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Default Value</em>' attribute.
      * @see #setDefaultValue(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_DefaultValue()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_DefaultValue()
      * @model dataType="org.eclipse.emf.ecore.xml.type.NormalizedString"
      *        extendedMetaData="kind='attribute' name='defaultValue'"
      * @generated
@@ -73,7 +73,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     String getDefaultValue();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getDefaultValue <em>Default Value</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getDefaultValue <em>Default Value</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Default Value</em>' attribute.
@@ -94,7 +94,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * @see #isSetIsArray()
      * @see #unsetIsArray()
      * @see #setIsArray(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_IsArray()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_IsArray()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='isArray'"
      * @generated
@@ -102,7 +102,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     boolean isIsArray();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#isIsArray <em>Is Array</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#isIsArray <em>Is Array</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Is Array</em>' attribute.
@@ -114,7 +114,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     void setIsArray( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#isIsArray <em>Is Array</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#isIsArray <em>Is Array</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetIsArray()
@@ -125,7 +125,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     void unsetIsArray();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#isIsArray <em>Is Array</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#isIsArray <em>Is Array</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Is Array</em>' attribute is set.
@@ -146,15 +146,14 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Max Index Attribute</em>' attribute.
      * @see #setMaxIndexAttribute(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_MaxIndexAttribute()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName"
-     *        extendedMetaData="kind='attribute' name='maxIndexAttribute'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_MaxIndexAttribute()
+     * @model extendedMetaData="kind='attribute' name='maxIndexAttribute'"
      * @generated
      */
     String getMaxIndexAttribute();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMaxIndexAttribute <em>Max Index Attribute</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Max Index Attribute</em>' attribute.
@@ -172,7 +171,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Max Value</em>' attribute.
      * @see #setMaxValue(BigDecimal)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_MaxValue()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_MaxValue()
      * @model dataType="org.eclipse.emf.ecore.xml.type.Decimal"
      *        extendedMetaData="kind='attribute' name='maxValue'"
      * @generated
@@ -180,7 +179,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     BigDecimal getMaxValue();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMaxValue <em>Max Value</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMaxValue <em>Max Value</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Max Value</em>' attribute.
@@ -203,7 +202,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * @see #isSetMinIndex()
      * @see #unsetMinIndex()
      * @see #setMinIndex(long)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_MinIndex()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_MinIndex()
      * @model default="0" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.UnsignedInt"
      *        extendedMetaData="kind='attribute' name='minIndex'"
      * @generated
@@ -211,7 +210,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     long getMinIndex();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinIndex <em>Min Index</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinIndex <em>Min Index</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Min Index</em>' attribute.
@@ -223,7 +222,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     void setMinIndex( long value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinIndex <em>Min Index</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinIndex <em>Min Index</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetMinIndex()
@@ -234,7 +233,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     void unsetMinIndex();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinIndex <em>Min Index</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinIndex <em>Min Index</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Min Index</em>' attribute is set.
@@ -254,7 +253,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Min Value</em>' attribute.
      * @see #setMinValue(BigDecimal)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_MinValue()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_MinValue()
      * @model dataType="org.eclipse.emf.ecore.xml.type.Decimal"
      *        extendedMetaData="kind='attribute' name='minValue'"
      * @generated
@@ -262,7 +261,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     BigDecimal getMinValue();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getMinValue <em>Min Value</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getMinValue <em>Min Value</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Min Value</em>' attribute.
@@ -280,15 +279,15 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -309,15 +308,15 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * @see #isSetPresCond()
      * @see #unsetPresCond()
      * @see #setPresCond(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_PresCond()
-     * @model default="M" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionName"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_PresCond()
+     * @model default="M" unsettable="true"
      *        extendedMetaData="kind='attribute' name='presCond'"
      * @generated
      */
     String getPresCond();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond</em>' attribute.
@@ -329,7 +328,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     void setPresCond( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetPresCond()
@@ -340,7 +339,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     void unsetPresCond();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCond <em>Pres Cond</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCond <em>Pres Cond</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Pres Cond</em>' attribute is set.
@@ -360,15 +359,14 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args</em>' attribute.
      * @see #setPresCondArgs(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_PresCondArgs()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionArgument"
-     *        extendedMetaData="kind='attribute' name='presCondArgs'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_PresCondArgs()
+     * @model extendedMetaData="kind='attribute' name='presCondArgs'"
      * @generated
      */
     String getPresCondArgs();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args</em>' attribute.
@@ -386,15 +384,14 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args ID</em>' attribute.
      * @see #setPresCondArgsID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_PresCondArgsID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='presCondArgsID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_PresCondArgsID()
+     * @model extendedMetaData="kind='attribute' name='presCondArgsID'"
      * @generated
      */
     String getPresCondArgsID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args ID</em>' attribute.
@@ -413,15 +410,14 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Size Attribute</em>' attribute.
      * @see #setSizeAttribute(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_SizeAttribute()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName"
-     *        extendedMetaData="kind='attribute' name='sizeAttribute'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_SizeAttribute()
+     * @model extendedMetaData="kind='attribute' name='sizeAttribute'"
      * @generated
      */
     String getSizeAttribute();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getSizeAttribute <em>Size Attribute</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getSizeAttribute <em>Size Attribute</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Size Attribute</em>' attribute.
@@ -439,15 +435,14 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Type</em>' attribute.
      * @see #setType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_Type()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name"
-     *        extendedMetaData="kind='attribute' name='type'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_Type()
+     * @model extendedMetaData="kind='attribute' name='type'"
      * @generated
      */
     String getType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getType <em>Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getType <em>Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type</em>' attribute.
@@ -468,15 +463,15 @@ public interface TSubDataAttribute extends TDocumentedClass {
      * @see #isSetTypeKind()
      * @see #unsetTypeKind()
      * @see #setTypeKind(Enumerator)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataAttribute_TypeKind()
-     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeTypeKind"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataAttribute_TypeKind()
+     * @model default="BASIC" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.AttributeTypeKind"
      *        extendedMetaData="kind='attribute' name='typeKind'"
      * @generated
      */
     Enumerator getTypeKind();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type Kind</em>' attribute.
@@ -488,7 +483,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     void setTypeKind( Enumerator value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getTypeKind <em>Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetTypeKind()
@@ -499,7 +494,7 @@ public interface TSubDataAttribute extends TDocumentedClass {
     void unsetTypeKind();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute#getTypeKind <em>Type Kind</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute#getTypeKind <em>Type Kind</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Type Kind</em>' attribute is set.
@@ -510,4 +505,4 @@ public interface TSubDataAttribute extends TDocumentedClass {
      */
     boolean isSetTypeKind();
 
-} // TSubDataAttribute
+} // SubDataAttribute
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TSubDataObject.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/SubDataObject.java
similarity index 72%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TSubDataObject.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/SubDataObject.java
index a31fa9f7abdcf2b0bcec8c0e58c8f47f256e9f36..b445a6820af52196e8c5af8211f799c355c99cfa 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TSubDataObject.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/SubDataObject.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TSub Data Object</b></em>'.
+ * A representation of the model object '<em><b>Sub Data Object</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -32,24 +32,24 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#isIsArray <em>Is Array</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMinIndex <em>Min Index</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getSizeAttribute <em>Size Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingType <em>Underlying Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#isIsArray <em>Is Array</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMinIndex <em>Min Index</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getSizeAttribute <em>Size Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingType <em>Underlying Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject()
  * @model extendedMetaData="name='tSubDataObject' kind='empty'"
  * @generated
  */
-public interface TSubDataObject extends TDocumentedClass {
+public interface SubDataObject extends DocumentedClass {
     /**
      * Returns the value of the '<em><b>Is Array</b></em>' attribute.
      * The default value is <code>"false"</code>.
@@ -62,7 +62,7 @@ public interface TSubDataObject extends TDocumentedClass {
      * @see #isSetIsArray()
      * @see #unsetIsArray()
      * @see #setIsArray(boolean)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_IsArray()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_IsArray()
      * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
      *        extendedMetaData="kind='attribute' name='isArray'"
      * @generated
@@ -70,7 +70,7 @@ public interface TSubDataObject extends TDocumentedClass {
     boolean isIsArray();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#isIsArray <em>Is Array</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#isIsArray <em>Is Array</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Is Array</em>' attribute.
@@ -82,7 +82,7 @@ public interface TSubDataObject extends TDocumentedClass {
     void setIsArray( boolean value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#isIsArray <em>Is Array</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#isIsArray <em>Is Array</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetIsArray()
@@ -93,7 +93,7 @@ public interface TSubDataObject extends TDocumentedClass {
     void unsetIsArray();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#isIsArray <em>Is Array</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#isIsArray <em>Is Array</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Is Array</em>' attribute is set.
@@ -114,15 +114,14 @@ public interface TSubDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Max Index Attribute</em>' attribute.
      * @see #setMaxIndexAttribute(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_MaxIndexAttribute()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName"
-     *        extendedMetaData="kind='attribute' name='maxIndexAttribute'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_MaxIndexAttribute()
+     * @model extendedMetaData="kind='attribute' name='maxIndexAttribute'"
      * @generated
      */
     String getMaxIndexAttribute();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMaxIndexAttribute <em>Max Index Attribute</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMaxIndexAttribute <em>Max Index Attribute</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Max Index Attribute</em>' attribute.
@@ -145,7 +144,7 @@ public interface TSubDataObject extends TDocumentedClass {
      * @see #isSetMinIndex()
      * @see #unsetMinIndex()
      * @see #setMinIndex(long)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_MinIndex()
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_MinIndex()
      * @model default="0" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.UnsignedInt"
      *        extendedMetaData="kind='attribute' name='minIndex'"
      * @generated
@@ -153,7 +152,7 @@ public interface TSubDataObject extends TDocumentedClass {
     long getMinIndex();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMinIndex <em>Min Index</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMinIndex <em>Min Index</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Min Index</em>' attribute.
@@ -165,7 +164,7 @@ public interface TSubDataObject extends TDocumentedClass {
     void setMinIndex( long value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMinIndex <em>Min Index</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMinIndex <em>Min Index</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetMinIndex()
@@ -176,7 +175,7 @@ public interface TSubDataObject extends TDocumentedClass {
     void unsetMinIndex();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getMinIndex <em>Min Index</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getMinIndex <em>Min Index</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Min Index</em>' attribute is set.
@@ -196,15 +195,15 @@ public interface TSubDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_Name()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObjectName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_Name()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='name'"
      * @generated
      */
     String getName();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getName <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Name</em>' attribute.
@@ -225,15 +224,15 @@ public interface TSubDataObject extends TDocumentedClass {
      * @see #isSetPresCond()
      * @see #unsetPresCond()
      * @see #setPresCond(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_PresCond()
-     * @model default="M" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionName"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_PresCond()
+     * @model default="M" unsettable="true"
      *        extendedMetaData="kind='attribute' name='presCond'"
      * @generated
      */
     String getPresCond();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCond <em>Pres Cond</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond</em>' attribute.
@@ -245,7 +244,7 @@ public interface TSubDataObject extends TDocumentedClass {
     void setPresCond( String value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCond <em>Pres Cond</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCond <em>Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetPresCond()
@@ -256,7 +255,7 @@ public interface TSubDataObject extends TDocumentedClass {
     void unsetPresCond();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCond <em>Pres Cond</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCond <em>Pres Cond</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Pres Cond</em>' attribute is set.
@@ -276,15 +275,14 @@ public interface TSubDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args</em>' attribute.
      * @see #setPresCondArgs(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_PresCondArgs()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditionArgument"
-     *        extendedMetaData="kind='attribute' name='presCondArgs'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_PresCondArgs()
+     * @model extendedMetaData="kind='attribute' name='presCondArgs'"
      * @generated
      */
     String getPresCondArgs();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCondArgs <em>Pres Cond Args</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args</em>' attribute.
@@ -302,15 +300,14 @@ public interface TSubDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Pres Cond Args ID</em>' attribute.
      * @see #setPresCondArgsID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_PresCondArgsID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='presCondArgsID'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_PresCondArgsID()
+     * @model extendedMetaData="kind='attribute' name='presCondArgsID'"
      * @generated
      */
     String getPresCondArgsID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getPresCondArgsID <em>Pres Cond Args ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Pres Cond Args ID</em>' attribute.
@@ -329,15 +326,14 @@ public interface TSubDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Size Attribute</em>' attribute.
      * @see #setSizeAttribute(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_SizeAttribute()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAttributeName"
-     *        extendedMetaData="kind='attribute' name='sizeAttribute'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_SizeAttribute()
+     * @model extendedMetaData="kind='attribute' name='sizeAttribute'"
      * @generated
      */
     String getSizeAttribute();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getSizeAttribute <em>Size Attribute</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getSizeAttribute <em>Size Attribute</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Size Attribute</em>' attribute.
@@ -355,15 +351,15 @@ public interface TSubDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Type</em>' attribute.
      * @see #setType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_Type()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCName" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_Type()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='type'"
      * @generated
      */
     String getType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getType <em>Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getType <em>Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Type</em>' attribute.
@@ -381,15 +377,14 @@ public interface TSubDataObject extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Underlying Type</em>' attribute.
      * @see #setUnderlyingType(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_UnderlyingType()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TIec61850Name"
-     *        extendedMetaData="kind='attribute' name='underlyingType'"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_UnderlyingType()
+     * @model extendedMetaData="kind='attribute' name='underlyingType'"
      * @generated
      */
     String getUnderlyingType();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingType <em>Underlying Type</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingType <em>Underlying Type</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Underlying Type</em>' attribute.
@@ -400,58 +395,58 @@ public interface TSubDataObject extends TDocumentedClass {
 
     /**
      * Returns the value of the '<em><b>Underlying Type Kind</b></em>' attribute.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind}.
+     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * <!-- begin-model-doc -->
      * The typeKind to be used for all "undefined" attributes of the CDC of this DataObject.
      * <!-- end-model-doc -->
      * @return the value of the '<em>Underlying Type Kind</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
      * @see #isSetUnderlyingTypeKind()
      * @see #unsetUnderlyingTypeKind()
-     * @see #setUnderlyingTypeKind(TDefinedAttributeTypeKind)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTSubDataObject_UnderlyingTypeKind()
+     * @see #setUnderlyingTypeKind(DefinedAttributeTypeKind)
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getSubDataObject_UnderlyingTypeKind()
      * @model unsettable="true"
      *        extendedMetaData="kind='attribute' name='underlyingTypeKind'"
      * @generated
      */
-    TDefinedAttributeTypeKind getUnderlyingTypeKind();
+    DefinedAttributeTypeKind getUnderlyingTypeKind();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Underlying Type Kind</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind
      * @see #isSetUnderlyingTypeKind()
      * @see #unsetUnderlyingTypeKind()
      * @see #getUnderlyingTypeKind()
      * @generated
      */
-    void setUnderlyingTypeKind( TDefinedAttributeTypeKind value );
+    void setUnderlyingTypeKind( DefinedAttributeTypeKind value );
 
     /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
+     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @see #isSetUnderlyingTypeKind()
      * @see #getUnderlyingTypeKind()
-     * @see #setUnderlyingTypeKind(TDefinedAttributeTypeKind)
+     * @see #setUnderlyingTypeKind(DefinedAttributeTypeKind)
      * @generated
      */
     void unsetUnderlyingTypeKind();
 
     /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute is set.
+     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject#getUnderlyingTypeKind <em>Underlying Type Kind</em>}' attribute is set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @return whether the value of the '<em>Underlying Type Kind</em>' attribute is set.
      * @see #unsetUnderlyingTypeKind()
      * @see #getUnderlyingTypeKind()
-     * @see #setUnderlyingTypeKind(TDefinedAttributeTypeKind)
+     * @see #setUnderlyingTypeKind(DefinedAttributeTypeKind)
      * @generated
      */
     boolean isSetUnderlyingTypeKind();
 
-} // TSubDataObject
+} // SubDataObject
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TChanges.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TChanges.java
deleted file mode 100644
index aec9bc7ff3faec7183aa383d5ea8463494362a40..0000000000000000000000000000000000000000
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TChanges.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/**
- *  Copyright (c) 2019 CentraleSupélec & EDF.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- * 
- */
-package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TChanges</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Namespace history, e.g., which version it is based on and which TISSUES it includes since then.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getChangesID <em>Changes ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getDate <em>Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getTissues <em>Tissues</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getVersion <em>Version</em>}</li>
- * </ul>
- *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTChanges()
- * @model extendedMetaData="name='tChanges' kind='empty'"
- * @generated
- */
-public interface TChanges extends EObject {
-    /**
-     * Returns the value of the '<em><b>Changes ID</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Documentation identifier referring to a textual description of changes (not TISSUE list). Shall only be used for private namespaces.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Changes ID</em>' attribute.
-     * @see #setChangesID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTChanges_ChangesID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID"
-     *        extendedMetaData="kind='attribute' name='changesID'"
-     * @generated
-     */
-    String getChangesID();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getChangesID <em>Changes ID</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Changes ID</em>' attribute.
-     * @see #getChangesID()
-     * @generated
-     */
-    void setChangesID( String value );
-
-    /**
-     * Returns the value of the '<em><b>Date</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * The date since the Tissues have been logged.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Date</em>' attribute.
-     * @see #setDate(XMLGregorianCalendar)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTChanges_Date()
-     * @model dataType="org.eclipse.emf.ecore.xml.type.Date"
-     *        extendedMetaData="kind='attribute' name='date'"
-     * @generated
-     */
-    XMLGregorianCalendar getDate();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getDate <em>Date</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Date</em>' attribute.
-     * @see #getDate()
-     * @generated
-     */
-    void setDate( XMLGregorianCalendar value );
-
-    /**
-     * Returns the value of the '<em><b>Release</b></em>' attribute.
-     * The default value is <code>"1"</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Release of the namespace this NSD file is based on, per default 1.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #setRelease(short)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTChanges_Release()
-     * @model default="1" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRelease"
-     *        extendedMetaData="kind='attribute' name='release'"
-     * @generated
-     */
-    short getRelease();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @generated
-     */
-    void setRelease( short value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    void unsetRelease();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRelease <em>Release</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Release</em>' attribute is set.
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    boolean isSetRelease();
-
-    /**
-     * Returns the value of the '<em><b>Revision</b></em>' attribute.
-     * The default value is <code>"A"</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Revision of the namespace this NSD file is based on, per default 'A'.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Revision</em>' attribute.
-     * @see #isSetRevision()
-     * @see #unsetRevision()
-     * @see #setRevision(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTChanges_Revision()
-     * @model default="A" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRevision"
-     *        extendedMetaData="kind='attribute' name='revision'"
-     * @generated
-     */
-    String getRevision();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRevision <em>Revision</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Revision</em>' attribute.
-     * @see #isSetRevision()
-     * @see #unsetRevision()
-     * @see #getRevision()
-     * @generated
-     */
-    void setRevision( String value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRevision <em>Revision</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetRevision()
-     * @see #getRevision()
-     * @see #setRevision(String)
-     * @generated
-     */
-    void unsetRevision();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getRevision <em>Revision</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Revision</em>' attribute is set.
-     * @see #unsetRevision()
-     * @see #getRevision()
-     * @see #setRevision(String)
-     * @generated
-     */
-    boolean isSetRevision();
-
-    /**
-     * Returns the value of the '<em><b>Tissues</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Comma-separated list of TISSUE numbers that were implemented since the previous namespace version/revision/release.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Tissues</em>' attribute.
-     * @see #setTissues(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTChanges_Tissues()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TissuesType"
-     *        extendedMetaData="kind='attribute' name='tissues'"
-     * @generated
-     */
-    String getTissues();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getTissues <em>Tissues</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Tissues</em>' attribute.
-     * @see #getTissues()
-     * @generated
-     */
-    void setTissues( String value );
-
-    /**
-     * Returns the value of the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Version of the namespace this NSD file is based on.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #setVersion(int)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTChanges_Version()
-     * @model unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSVersion" required="true"
-     *        extendedMetaData="kind='attribute' name='version'"
-     * @generated
-     */
-    int getVersion();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @generated
-     */
-    void setVersion( int value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    void unsetVersion();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges#getVersion <em>Version</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Version</em>' attribute is set.
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    boolean isSetVersion();
-
-} // TChanges
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceNsUsage.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceNsUsage.java
deleted file mode 100644
index a7f2d5c7896634a7124b48ee611490cec4514b31..0000000000000000000000000000000000000000
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TServiceNsUsage.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/**
- *  Copyright (c) 2019 CentraleSupélec & EDF.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- * 
- */
-package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TService Ns Usage</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Describes the list of (domain) NS for which a ServiceNS is applicable.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getAppliesTo <em>Applies To</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getId <em>Id</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getVersion <em>Version</em>}</li>
- * </ul>
- *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNsUsage()
- * @model extendedMetaData="name='tServiceNsUsage' kind='elementOnly'"
- * @generated
- */
-public interface TServiceNsUsage extends EObject {
-    /**
-     * Returns the value of the '<em><b>Applies To</b></em>' containment reference list.
-     * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * References to namespaces this ServiceNS can be used with.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Applies To</em>' containment reference list.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNsUsage_AppliesTo()
-     * @model containment="true" required="true"
-     *        extendedMetaData="kind='element' name='AppliesTo' namespace='##targetNamespace'"
-     * @generated
-     */
-    EList< AppliesToType > getAppliesTo();
-
-    /**
-     * Returns the value of the '<em><b>Id</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifier of the namespace, e.g., "IEC 61850-7-4", "(Tr)IEC 61850-90-4".
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Id</em>' attribute.
-     * @see #setId(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNsUsage_Id()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSIdentifier" required="true"
-     *        extendedMetaData="kind='attribute' name='id'"
-     * @generated
-     */
-    String getId();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getId <em>Id</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Id</em>' attribute.
-     * @see #getId()
-     * @generated
-     */
-    void setId( String value );
-
-    /**
-     * Returns the value of the '<em><b>Publication Stage</b></em>' attribute.
-     * The default value is <code>"IS"</code>.
-     * The literals are from the enumeration {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * The publication stage of the namespace, by default IS.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
-     * @see #isSetPublicationStage()
-     * @see #unsetPublicationStage()
-     * @see #setPublicationStage(TPubStage)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNsUsage_PublicationStage()
-     * @model default="IS" unsettable="true"
-     *        extendedMetaData="kind='attribute' name='publicationStage'"
-     * @generated
-     */
-    TPubStage getPublicationStage();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getPublicationStage <em>Publication Stage</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Publication Stage</em>' attribute.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage
-     * @see #isSetPublicationStage()
-     * @see #unsetPublicationStage()
-     * @see #getPublicationStage()
-     * @generated
-     */
-    void setPublicationStage( TPubStage value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getPublicationStage <em>Publication Stage</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetPublicationStage()
-     * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
-     * @generated
-     */
-    void unsetPublicationStage();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getPublicationStage <em>Publication Stage</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Publication Stage</em>' attribute is set.
-     * @see #unsetPublicationStage()
-     * @see #getPublicationStage()
-     * @see #setPublicationStage(TPubStage)
-     * @generated
-     */
-    boolean isSetPublicationStage();
-
-    /**
-     * Returns the value of the '<em><b>Release</b></em>' attribute.
-     * The default value is <code>"1"</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Release of the namespace version and revision, by default 1.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #setRelease(short)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNsUsage_Release()
-     * @model default="1" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRelease"
-     *        extendedMetaData="kind='attribute' name='release'"
-     * @generated
-     */
-    short getRelease();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Release</em>' attribute.
-     * @see #isSetRelease()
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @generated
-     */
-    void setRelease( short value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRelease <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    void unsetRelease();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRelease <em>Release</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Release</em>' attribute is set.
-     * @see #unsetRelease()
-     * @see #getRelease()
-     * @see #setRelease(short)
-     * @generated
-     */
-    boolean isSetRelease();
-
-    /**
-     * Returns the value of the '<em><b>Revision</b></em>' attribute.
-     * The default value is <code>"A"</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Revision of the namespace version, by default 'A'.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Revision</em>' attribute.
-     * @see #isSetRevision()
-     * @see #unsetRevision()
-     * @see #setRevision(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNsUsage_Revision()
-     * @model default="A" unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSRevision"
-     *        extendedMetaData="kind='attribute' name='revision'"
-     * @generated
-     */
-    String getRevision();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRevision <em>Revision</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Revision</em>' attribute.
-     * @see #isSetRevision()
-     * @see #unsetRevision()
-     * @see #getRevision()
-     * @generated
-     */
-    void setRevision( String value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRevision <em>Revision</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetRevision()
-     * @see #getRevision()
-     * @see #setRevision(String)
-     * @generated
-     */
-    void unsetRevision();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getRevision <em>Revision</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Revision</em>' attribute is set.
-     * @see #unsetRevision()
-     * @see #getRevision()
-     * @see #setRevision(String)
-     * @generated
-     */
-    boolean isSetRevision();
-
-    /**
-     * Returns the value of the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Version (year) of the namespace.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #setVersion(int)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTServiceNsUsage_Version()
-     * @model unsettable="true" dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSVersion" required="true"
-     *        extendedMetaData="kind='attribute' name='version'"
-     * @generated
-     */
-    int getVersion();
-
-    /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Version</em>' attribute.
-     * @see #isSetVersion()
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @generated
-     */
-    void setVersion( int value );
-
-    /**
-     * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    void unsetVersion();
-
-    /**
-     * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage#getVersion <em>Version</em>}' attribute is set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return whether the value of the '<em>Version</em>' attribute is set.
-     * @see #unsetVersion()
-     * @see #getVersion()
-     * @see #setVersion(int)
-     * @generated
-     */
-    boolean isSetVersion();
-
-} // TServiceNsUsage
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TTitledClass.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TitledClass.java
similarity index 82%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TTitledClass.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TitledClass.java
index e6ff9aaacec0140df4f26e212cfbb8c56b1bc6bf..bfa59105229f99e61b855f9b2e7f7c2b58101d71 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TTitledClass.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TitledClass.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TTitled Class</b></em>'.
+ * A representation of the model object '<em><b>Titled Class</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -32,14 +32,14 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass#getTitleID <em>Title ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass#getTitleID <em>Title ID</em>}</li>
  * </ul>
  *
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTTitledClass()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTitledClass()
  * @model extendedMetaData="name='tTitledClass' kind='empty'"
  * @generated
  */
-public interface TTitledClass extends TDocumentedClass {
+public interface TitledClass extends DocumentedClass {
     /**
      * Returns the value of the '<em><b>Title ID</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -49,15 +49,15 @@ public interface TTitledClass extends TDocumentedClass {
      * <!-- end-model-doc -->
      * @return the value of the '<em>Title ID</em>' attribute.
      * @see #setTitleID(String)
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTTitledClass_TitleID()
-     * @model dataType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocID" required="true"
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTitledClass_TitleID()
+     * @model required="true"
      *        extendedMetaData="kind='attribute' name='titleID'"
      * @generated
      */
     String getTitleID();
 
     /**
-     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass#getTitleID <em>Title ID</em>}' attribute.
+     * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass#getTitleID <em>Title ID</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the new value of the '<em>Title ID</em>' attribute.
@@ -66,4 +66,4 @@ public interface TTitledClass extends TDocumentedClass {
      */
     void setTitleID( String value );
 
-} // TTitledClass
+} // TitledClass
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TUndefinedAttributeTypeKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/UndefinedAttributeTypeKind.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TUndefinedAttributeTypeKind.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/UndefinedAttributeTypeKind.java
index cbcda1db4d546abd0be2033cbcaedc6d59131494..a6cc91a4e38f90d990b33d1dc0b47b76221b8682 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TUndefinedAttributeTypeKind.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/UndefinedAttributeTypeKind.java
@@ -27,17 +27,17 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>TUndefined Attribute Type Kind</b></em>',
+ * A representation of the literals of the enumeration '<em><b>Undefined Attribute Type Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * Type kind for a data attribute which has its type "undefined".
  * <!-- end-model-doc -->
- * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTUndefinedAttributeTypeKind()
+ * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getUndefinedAttributeTypeKind()
  * @model extendedMetaData="name='tUndefinedAttributeTypeKind'"
  * @generated
  */
-public enum TUndefinedAttributeTypeKind implements Enumerator {
+public enum UndefinedAttributeTypeKind implements Enumerator {
     /**
      * The '<em><b>Undefined</b></em>' literal object.
      * <!-- begin-user-doc -->
@@ -66,33 +66,33 @@ public enum TUndefinedAttributeTypeKind implements Enumerator {
     public static final int UNDEFINED_VALUE = 0;
 
     /**
-     * An array of all the '<em><b>TUndefined Attribute Type Kind</b></em>' enumerators.
+     * An array of all the '<em><b>Undefined Attribute Type Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private static final TUndefinedAttributeTypeKind[] VALUES_ARRAY = new TUndefinedAttributeTypeKind[] { UNDEFINED, };
+    private static final UndefinedAttributeTypeKind[] VALUES_ARRAY = new UndefinedAttributeTypeKind[] { UNDEFINED, };
 
     /**
-     * A public read-only list of all the '<em><b>TUndefined Attribute Type Kind</b></em>' enumerators.
+     * A public read-only list of all the '<em><b>Undefined Attribute Type Kind</b></em>' enumerators.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List< TUndefinedAttributeTypeKind > VALUES = Collections
+    public static final List< UndefinedAttributeTypeKind > VALUES = Collections
             .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
-     * Returns the '<em><b>TUndefined Attribute Type Kind</b></em>' literal with the specified literal value.
+     * Returns the '<em><b>Undefined Attribute Type Kind</b></em>' literal with the specified literal value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param literal the literal.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TUndefinedAttributeTypeKind get( String literal ) {
+    public static UndefinedAttributeTypeKind get( String literal ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TUndefinedAttributeTypeKind result = VALUES_ARRAY[i];
+            UndefinedAttributeTypeKind result = VALUES_ARRAY[i];
             if( result.toString().equals( literal ) ) {
                 return result;
             }
@@ -101,16 +101,16 @@ public enum TUndefinedAttributeTypeKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TUndefined Attribute Type Kind</b></em>' literal with the specified name.
+     * Returns the '<em><b>Undefined Attribute Type Kind</b></em>' literal with the specified name.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param name the name.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TUndefinedAttributeTypeKind getByName( String name ) {
+    public static UndefinedAttributeTypeKind getByName( String name ) {
         for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
-            TUndefinedAttributeTypeKind result = VALUES_ARRAY[i];
+            UndefinedAttributeTypeKind result = VALUES_ARRAY[i];
             if( result.getName().equals( name ) ) {
                 return result;
             }
@@ -119,14 +119,14 @@ public enum TUndefinedAttributeTypeKind implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>TUndefined Attribute Type Kind</b></em>' literal with the specified integer value.
+     * Returns the '<em><b>Undefined Attribute Type Kind</b></em>' literal with the specified integer value.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @param value the integer value.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
-    public static TUndefinedAttributeTypeKind get( int value ) {
+    public static UndefinedAttributeTypeKind get( int value ) {
         switch( value ) {
         case UNDEFINED_VALUE:
             return UNDEFINED;
@@ -161,7 +161,7 @@ public enum TUndefinedAttributeTypeKind implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    private TUndefinedAttributeTypeKind( int value, String name, String literal ) {
+    private UndefinedAttributeTypeKind( int value, String name, String literal ) {
         this.value = value;
         this.name = name;
         this.literal = literal;
@@ -208,4 +208,4 @@ public enum TUndefinedAttributeTypeKind implements Enumerator {
         return literal;
     }
 
-} //TUndefinedAttributeTypeKind
+} //UndefinedAttributeTypeKind
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAbbreviationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java
similarity index 85%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAbbreviationImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java
index 5918e7f96d17cc00377498c8f942f2869e755be3..c6f37ca925fb3631a9758bbb70d497318650942e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAbbreviationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -31,19 +31,19 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TAbbreviation</b></em>'.
+ * An implementation of the model object '<em><b>Abbreviation</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationImpl#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationImpl#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationImpl#getName <em>Name</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements TAbbreviation {
+public class AbbreviationImpl extends MinimalEObjectImpl.Container implements Abbreviation {
     /**
      * The default value of the '{@link #getDescID() <em>Desc ID</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -89,7 +89,7 @@ public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements T
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TAbbreviationImpl() {
+    protected AbbreviationImpl() {
         super();
     }
 
@@ -100,7 +100,7 @@ public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements T
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TABBREVIATION;
+        return NsdPackage.Literals.ABBREVIATION;
     }
 
     /**
@@ -123,7 +123,7 @@ public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements T
         String oldDescID = descID;
         descID = newDescID;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TABBREVIATION__DESC_ID, oldDescID, descID ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.ABBREVIATION__DESC_ID, oldDescID, descID ) );
     }
 
     /**
@@ -146,7 +146,7 @@ public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements T
         String oldName = name;
         name = newName;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TABBREVIATION__NAME, oldName, name ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ABBREVIATION__NAME, oldName, name ) );
     }
 
     /**
@@ -157,9 +157,9 @@ public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements T
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TABBREVIATION__DESC_ID:
+        case NsdPackage.ABBREVIATION__DESC_ID:
             return getDescID();
-        case NsdPackage.TABBREVIATION__NAME:
+        case NsdPackage.ABBREVIATION__NAME:
             return getName();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -173,10 +173,10 @@ public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements T
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TABBREVIATION__DESC_ID:
+        case NsdPackage.ABBREVIATION__DESC_ID:
             setDescID( ( String ) newValue );
             return;
-        case NsdPackage.TABBREVIATION__NAME:
+        case NsdPackage.ABBREVIATION__NAME:
             setName( ( String ) newValue );
             return;
         }
@@ -191,10 +191,10 @@ public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements T
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TABBREVIATION__DESC_ID:
+        case NsdPackage.ABBREVIATION__DESC_ID:
             setDescID( DESC_ID_EDEFAULT );
             return;
-        case NsdPackage.TABBREVIATION__NAME:
+        case NsdPackage.ABBREVIATION__NAME:
             setName( NAME_EDEFAULT );
             return;
         }
@@ -209,9 +209,9 @@ public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements T
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TABBREVIATION__DESC_ID:
+        case NsdPackage.ABBREVIATION__DESC_ID:
             return DESC_ID_EDEFAULT == null ? descID != null : !DESC_ID_EDEFAULT.equals( descID );
-        case NsdPackage.TABBREVIATION__NAME:
+        case NsdPackage.ABBREVIATION__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
         }
         return super.eIsSet( featureID );
@@ -235,4 +235,4 @@ public class TAbbreviationImpl extends MinimalEObjectImpl.Container implements T
         return result.toString();
     }
 
-} //TAbbreviationImpl
+} //AbbreviationImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAbbreviationsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationsImpl.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAbbreviationsImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationsImpl.java
index d61cb7753f4de08a700642c41f55d766f2624a34..58dc57289f0f2bf970cb3d131bcb5e74e5abe709 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAbbreviationsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationsImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations;
 
 import java.util.Collection;
 
@@ -39,18 +39,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TAbbreviations</b></em>'.
+ * An implementation of the model object '<em><b>Abbreviations</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbbreviationsImpl#getAbbreviation <em>Abbreviation</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbbreviationsImpl#getAbbreviation <em>Abbreviation</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TAbbreviationsImpl extends MinimalEObjectImpl.Container implements TAbbreviations {
+public class AbbreviationsImpl extends MinimalEObjectImpl.Container implements Abbreviations {
     /**
      * The cached value of the '{@link #getAbbreviation() <em>Abbreviation</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -59,14 +59,14 @@ public class TAbbreviationsImpl extends MinimalEObjectImpl.Container implements
      * @generated
      * @ordered
      */
-    protected EList< TAbbreviation > abbreviation;
+    protected EList< Abbreviation > abbreviation;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TAbbreviationsImpl() {
+    protected AbbreviationsImpl() {
         super();
     }
 
@@ -77,7 +77,7 @@ public class TAbbreviationsImpl extends MinimalEObjectImpl.Container implements
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TABBREVIATIONS;
+        return NsdPackage.Literals.ABBREVIATIONS;
     }
 
     /**
@@ -86,10 +86,10 @@ public class TAbbreviationsImpl extends MinimalEObjectImpl.Container implements
      * @generated
      */
     @Override
-    public EList< TAbbreviation > getAbbreviation() {
+    public EList< Abbreviation > getAbbreviation() {
         if( abbreviation == null ) {
-            abbreviation = new EObjectContainmentEList< TAbbreviation >( TAbbreviation.class, this,
-                    NsdPackage.TABBREVIATIONS__ABBREVIATION );
+            abbreviation = new EObjectContainmentEList< Abbreviation >( Abbreviation.class, this,
+                    NsdPackage.ABBREVIATIONS__ABBREVIATION );
         }
         return abbreviation;
     }
@@ -102,7 +102,7 @@ public class TAbbreviationsImpl extends MinimalEObjectImpl.Container implements
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TABBREVIATIONS__ABBREVIATION:
+        case NsdPackage.ABBREVIATIONS__ABBREVIATION:
             return ( ( InternalEList< ? > ) getAbbreviation() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -116,7 +116,7 @@ public class TAbbreviationsImpl extends MinimalEObjectImpl.Container implements
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TABBREVIATIONS__ABBREVIATION:
+        case NsdPackage.ABBREVIATIONS__ABBREVIATION:
             return getAbbreviation();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -131,9 +131,9 @@ public class TAbbreviationsImpl extends MinimalEObjectImpl.Container implements
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TABBREVIATIONS__ABBREVIATION:
+        case NsdPackage.ABBREVIATIONS__ABBREVIATION:
             getAbbreviation().clear();
-            getAbbreviation().addAll( ( Collection< ? extends TAbbreviation > ) newValue );
+            getAbbreviation().addAll( ( Collection< ? extends Abbreviation > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -147,7 +147,7 @@ public class TAbbreviationsImpl extends MinimalEObjectImpl.Container implements
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TABBREVIATIONS__ABBREVIATION:
+        case NsdPackage.ABBREVIATIONS__ABBREVIATION:
             getAbbreviation().clear();
             return;
         }
@@ -162,10 +162,10 @@ public class TAbbreviationsImpl extends MinimalEObjectImpl.Container implements
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TABBREVIATIONS__ABBREVIATION:
+        case NsdPackage.ABBREVIATIONS__ABBREVIATION:
             return abbreviation != null && !abbreviation.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TAbbreviationsImpl
+} //AbbreviationsImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAbstractLNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java
similarity index 85%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAbstractLNClassImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java
index 742ec4bdc0f8624a5c43c64e4b61276e106622e6..777bdd1acab5dc1b2f39449bc0d6642159f5e56e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAbstractLNClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -30,18 +30,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TAbstract LN Class</b></em>'.
+ * An implementation of the model object '<em><b>Abstract LN Class</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAbstractLNClassImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AbstractLNClassImpl#getName <em>Name</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TAbstractLNClassImpl extends TAnyLNClassImpl implements TAbstractLNClass {
+public class AbstractLNClassImpl extends AnyLNClassImpl implements AbstractLNClass {
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -67,7 +67,7 @@ public class TAbstractLNClassImpl extends TAnyLNClassImpl implements TAbstractLN
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TAbstractLNClassImpl() {
+    protected AbstractLNClassImpl() {
         super();
     }
 
@@ -78,7 +78,7 @@ public class TAbstractLNClassImpl extends TAnyLNClassImpl implements TAbstractLN
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TABSTRACT_LN_CLASS;
+        return NsdPackage.Literals.ABSTRACT_LN_CLASS;
     }
 
     /**
@@ -101,7 +101,7 @@ public class TAbstractLNClassImpl extends TAnyLNClassImpl implements TAbstractLN
         String oldName = name;
         name = newName;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TABSTRACT_LN_CLASS__NAME, oldName, name ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.ABSTRACT_LN_CLASS__NAME, oldName, name ) );
     }
 
     /**
@@ -112,7 +112,7 @@ public class TAbstractLNClassImpl extends TAnyLNClassImpl implements TAbstractLN
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TABSTRACT_LN_CLASS__NAME:
+        case NsdPackage.ABSTRACT_LN_CLASS__NAME:
             return getName();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -126,7 +126,7 @@ public class TAbstractLNClassImpl extends TAnyLNClassImpl implements TAbstractLN
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TABSTRACT_LN_CLASS__NAME:
+        case NsdPackage.ABSTRACT_LN_CLASS__NAME:
             setName( ( String ) newValue );
             return;
         }
@@ -141,7 +141,7 @@ public class TAbstractLNClassImpl extends TAnyLNClassImpl implements TAbstractLN
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TABSTRACT_LN_CLASS__NAME:
+        case NsdPackage.ABSTRACT_LN_CLASS__NAME:
             setName( NAME_EDEFAULT );
             return;
         }
@@ -156,7 +156,7 @@ public class TAbstractLNClassImpl extends TAnyLNClassImpl implements TAbstractLN
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TABSTRACT_LN_CLASS__NAME:
+        case NsdPackage.ABSTRACT_LN_CLASS__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
         }
         return super.eIsSet( featureID );
@@ -178,4 +178,4 @@ public class TAbstractLNClassImpl extends TAnyLNClassImpl implements TAbstractLN
         return result.toString();
     }
 
-} //TAbstractLNClassImpl
+} //AbstractLNClassImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAnyLNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java
similarity index 80%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAnyLNClassImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java
index 0c0148ea7a0aa5a2d6db043b1476c72e538ffe1e..cb4a9cdf76f6a8c37041c6b21582ce087074c49e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TAnyLNClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject;
 
 import java.util.Collection;
 
@@ -40,19 +40,19 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TAny LN Class</b></em>'.
+ * An implementation of the model object '<em><b>Any LN Class</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAnyLNClassImpl#getDataObject <em>Data Object</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TAnyLNClassImpl#getBase <em>Base</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AnyLNClassImpl#getDataObject <em>Data Object</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AnyLNClassImpl#getBase <em>Base</em>}</li>
  * </ul>
  *
  * @generated
  */
-public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLNClass {
+public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNClass {
     /**
      * The cached value of the '{@link #getDataObject() <em>Data Object</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -61,7 +61,7 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
      * @generated
      * @ordered
      */
-    protected EList< TDataObject > dataObject;
+    protected EList< DataObject > dataObject;
 
     /**
      * The default value of the '{@link #getBase() <em>Base</em>}' attribute.
@@ -88,7 +88,7 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TAnyLNClassImpl() {
+    protected AnyLNClassImpl() {
         super();
     }
 
@@ -99,7 +99,7 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TANY_LN_CLASS;
+        return NsdPackage.Literals.ANY_LN_CLASS;
     }
 
     /**
@@ -108,10 +108,10 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
      * @generated
      */
     @Override
-    public EList< TDataObject > getDataObject() {
+    public EList< DataObject > getDataObject() {
         if( dataObject == null ) {
-            dataObject = new EObjectContainmentEList< TDataObject >( TDataObject.class, this,
-                    NsdPackage.TANY_LN_CLASS__DATA_OBJECT );
+            dataObject = new EObjectContainmentEList< DataObject >( DataObject.class, this,
+                    NsdPackage.ANY_LN_CLASS__DATA_OBJECT );
         }
         return dataObject;
     }
@@ -136,7 +136,7 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
         String oldBase = base;
         base = newBase;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TANY_LN_CLASS__BASE, oldBase, base ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ANY_LN_CLASS__BASE, oldBase, base ) );
     }
 
     /**
@@ -147,7 +147,7 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TANY_LN_CLASS__DATA_OBJECT:
+        case NsdPackage.ANY_LN_CLASS__DATA_OBJECT:
             return ( ( InternalEList< ? > ) getDataObject() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -161,9 +161,9 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TANY_LN_CLASS__DATA_OBJECT:
+        case NsdPackage.ANY_LN_CLASS__DATA_OBJECT:
             return getDataObject();
-        case NsdPackage.TANY_LN_CLASS__BASE:
+        case NsdPackage.ANY_LN_CLASS__BASE:
             return getBase();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -178,11 +178,11 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TANY_LN_CLASS__DATA_OBJECT:
+        case NsdPackage.ANY_LN_CLASS__DATA_OBJECT:
             getDataObject().clear();
-            getDataObject().addAll( ( Collection< ? extends TDataObject > ) newValue );
+            getDataObject().addAll( ( Collection< ? extends DataObject > ) newValue );
             return;
-        case NsdPackage.TANY_LN_CLASS__BASE:
+        case NsdPackage.ANY_LN_CLASS__BASE:
             setBase( ( String ) newValue );
             return;
         }
@@ -197,10 +197,10 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TANY_LN_CLASS__DATA_OBJECT:
+        case NsdPackage.ANY_LN_CLASS__DATA_OBJECT:
             getDataObject().clear();
             return;
-        case NsdPackage.TANY_LN_CLASS__BASE:
+        case NsdPackage.ANY_LN_CLASS__BASE:
             setBase( BASE_EDEFAULT );
             return;
         }
@@ -215,9 +215,9 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TANY_LN_CLASS__DATA_OBJECT:
+        case NsdPackage.ANY_LN_CLASS__DATA_OBJECT:
             return dataObject != null && !dataObject.isEmpty();
-        case NsdPackage.TANY_LN_CLASS__BASE:
+        case NsdPackage.ANY_LN_CLASS__BASE:
             return BASE_EDEFAULT == null ? base != null : !BASE_EDEFAULT.equals( base );
         }
         return super.eIsSet( featureID );
@@ -239,4 +239,4 @@ public abstract class TAnyLNClassImpl extends TTitledClassImpl implements TAnyLN
         return result.toString();
     }
 
-} //TAnyLNClassImpl
+} //AnyLNClassImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TApplicableServiceNSImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServiceNSImpl.java
similarity index 79%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TApplicableServiceNSImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServiceNSImpl.java
index c1d3403b2f3a2570b08cee7542c357a0bfbaa7b3..356f7eb2efe2e65e861ef0faa9a46efef72aa521 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TApplicableServiceNSImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServiceNSImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage;
 
 import java.util.Collection;
 
@@ -42,20 +42,20 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TApplicable Service NS</b></em>'.
+ * An implementation of the model object '<em><b>Applicable Service NS</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServiceNSImpl#getServiceNsUsage <em>Service Ns Usage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServiceNSImpl#getDate <em>Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServiceNSImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServiceNSImpl#getServiceNsUsage <em>Service Ns Usage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServiceNSImpl#getDate <em>Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServiceNSImpl#getVersion <em>Version</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TApplicableServiceNS {
+public class ApplicableServiceNSImpl extends CopyrightedImpl implements ApplicableServiceNS {
     /**
      * The cached value of the '{@link #getServiceNsUsage() <em>Service Ns Usage</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -64,7 +64,7 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
      * @generated
      * @ordered
      */
-    protected EList< TServiceNsUsage > serviceNsUsage;
+    protected EList< ServiceNsUsage > serviceNsUsage;
 
     /**
      * The default value of the '{@link #getDate() <em>Date</em>}' attribute.
@@ -120,7 +120,7 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TApplicableServiceNSImpl() {
+    protected ApplicableServiceNSImpl() {
         super();
     }
 
@@ -131,7 +131,7 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TAPPLICABLE_SERVICE_NS;
+        return NsdPackage.Literals.APPLICABLE_SERVICE_NS;
     }
 
     /**
@@ -140,10 +140,10 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
      * @generated
      */
     @Override
-    public EList< TServiceNsUsage > getServiceNsUsage() {
+    public EList< ServiceNsUsage > getServiceNsUsage() {
         if( serviceNsUsage == null ) {
-            serviceNsUsage = new EObjectContainmentEList< TServiceNsUsage >( TServiceNsUsage.class, this,
-                    NsdPackage.TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE );
+            serviceNsUsage = new EObjectContainmentEList< ServiceNsUsage >( ServiceNsUsage.class, this,
+                    NsdPackage.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE );
         }
         return serviceNsUsage;
     }
@@ -168,7 +168,7 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
         XMLGregorianCalendar oldDate = date;
         date = newDate;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TAPPLICABLE_SERVICE_NS__DATE, oldDate, date ) );
+                NsdPackage.APPLICABLE_SERVICE_NS__DATE, oldDate, date ) );
     }
 
     /**
@@ -193,7 +193,7 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
         boolean oldVersionESet = versionESet;
         versionESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TAPPLICABLE_SERVICE_NS__VERSION, oldVersion, version, !oldVersionESet ) );
+                NsdPackage.APPLICABLE_SERVICE_NS__VERSION, oldVersion, version, !oldVersionESet ) );
     }
 
     /**
@@ -208,7 +208,7 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
         version = VERSION_EDEFAULT;
         versionESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TAPPLICABLE_SERVICE_NS__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
+                NsdPackage.APPLICABLE_SERVICE_NS__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
     }
 
     /**
@@ -229,7 +229,7 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
             return ( ( InternalEList< ? > ) getServiceNsUsage() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -243,11 +243,11 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
             return getServiceNsUsage();
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__DATE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__DATE:
             return getDate();
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__VERSION:
+        case NsdPackage.APPLICABLE_SERVICE_NS__VERSION:
             return getVersion();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -262,14 +262,14 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
             getServiceNsUsage().clear();
-            getServiceNsUsage().addAll( ( Collection< ? extends TServiceNsUsage > ) newValue );
+            getServiceNsUsage().addAll( ( Collection< ? extends ServiceNsUsage > ) newValue );
             return;
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__DATE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__DATE:
             setDate( ( XMLGregorianCalendar ) newValue );
             return;
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__VERSION:
+        case NsdPackage.APPLICABLE_SERVICE_NS__VERSION:
             setVersion( ( Long ) newValue );
             return;
         }
@@ -284,13 +284,13 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
             getServiceNsUsage().clear();
             return;
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__DATE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__DATE:
             setDate( DATE_EDEFAULT );
             return;
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__VERSION:
+        case NsdPackage.APPLICABLE_SERVICE_NS__VERSION:
             unsetVersion();
             return;
         }
@@ -305,11 +305,11 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE:
             return serviceNsUsage != null && !serviceNsUsage.isEmpty();
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__DATE:
+        case NsdPackage.APPLICABLE_SERVICE_NS__DATE:
             return DATE_EDEFAULT == null ? date != null : !DATE_EDEFAULT.equals( date );
-        case NsdPackage.TAPPLICABLE_SERVICE_NS__VERSION:
+        case NsdPackage.APPLICABLE_SERVICE_NS__VERSION:
             return isSetVersion();
         }
         return super.eIsSet( featureID );
@@ -336,4 +336,4 @@ public class TApplicableServiceNSImpl extends TCopyrightedImpl implements TAppli
         return result.toString();
     }
 
-} //TApplicableServiceNSImpl
+} //ApplicableServiceNSImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TApplicableServicesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServicesImpl.java
similarity index 75%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TApplicableServicesImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServicesImpl.java
index d5dbe7b7c437126ee2b74753fdc551564d99714f..c6bc7b7b69eb8803bcc5bffe247abc100cb63a70 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TApplicableServicesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServicesImpl.java
@@ -19,10 +19,10 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf;
 
 import java.util.Collection;
 
@@ -40,19 +40,19 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TApplicable Services</b></em>'.
+ * An implementation of the model object '<em><b>Applicable Services</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServicesImpl#getService <em>Service</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TApplicableServicesImpl#getDataSetMemberOf <em>Data Set Member Of</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServicesImpl#getService <em>Service</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ApplicableServicesImpl#getDataSetMemberOf <em>Data Set Member Of</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implements TApplicableServices {
+public class ApplicableServicesImpl extends MinimalEObjectImpl.Container implements ApplicableServices {
     /**
      * The cached value of the '{@link #getService() <em>Service</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -71,14 +71,14 @@ public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implem
      * @generated
      * @ordered
      */
-    protected EList< TDataSetMemberOf > dataSetMemberOf;
+    protected EList< DataSetMemberOf > dataSetMemberOf;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TApplicableServicesImpl() {
+    protected ApplicableServicesImpl() {
         super();
     }
 
@@ -89,7 +89,7 @@ public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implem
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TAPPLICABLE_SERVICES;
+        return NsdPackage.Literals.APPLICABLE_SERVICES;
     }
 
     /**
@@ -101,7 +101,7 @@ public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implem
     public EList< ServiceType > getService() {
         if( service == null ) {
             service = new EObjectContainmentEList< ServiceType >( ServiceType.class, this,
-                    NsdPackage.TAPPLICABLE_SERVICES__SERVICE );
+                    NsdPackage.APPLICABLE_SERVICES__SERVICE );
         }
         return service;
     }
@@ -112,10 +112,10 @@ public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implem
      * @generated
      */
     @Override
-    public EList< TDataSetMemberOf > getDataSetMemberOf() {
+    public EList< DataSetMemberOf > getDataSetMemberOf() {
         if( dataSetMemberOf == null ) {
-            dataSetMemberOf = new EObjectContainmentEList< TDataSetMemberOf >( TDataSetMemberOf.class, this,
-                    NsdPackage.TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF );
+            dataSetMemberOf = new EObjectContainmentEList< DataSetMemberOf >( DataSetMemberOf.class, this,
+                    NsdPackage.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF );
         }
         return dataSetMemberOf;
     }
@@ -128,9 +128,9 @@ public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implem
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICES__SERVICE:
+        case NsdPackage.APPLICABLE_SERVICES__SERVICE:
             return ( ( InternalEList< ? > ) getService() ).basicRemove( otherEnd, msgs );
-        case NsdPackage.TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
+        case NsdPackage.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
             return ( ( InternalEList< ? > ) getDataSetMemberOf() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -144,9 +144,9 @@ public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implem
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICES__SERVICE:
+        case NsdPackage.APPLICABLE_SERVICES__SERVICE:
             return getService();
-        case NsdPackage.TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
+        case NsdPackage.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
             return getDataSetMemberOf();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -161,13 +161,13 @@ public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implem
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICES__SERVICE:
+        case NsdPackage.APPLICABLE_SERVICES__SERVICE:
             getService().clear();
             getService().addAll( ( Collection< ? extends ServiceType > ) newValue );
             return;
-        case NsdPackage.TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
+        case NsdPackage.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
             getDataSetMemberOf().clear();
-            getDataSetMemberOf().addAll( ( Collection< ? extends TDataSetMemberOf > ) newValue );
+            getDataSetMemberOf().addAll( ( Collection< ? extends DataSetMemberOf > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -181,10 +181,10 @@ public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implem
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICES__SERVICE:
+        case NsdPackage.APPLICABLE_SERVICES__SERVICE:
             getService().clear();
             return;
-        case NsdPackage.TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
+        case NsdPackage.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
             getDataSetMemberOf().clear();
             return;
         }
@@ -199,12 +199,12 @@ public class TApplicableServicesImpl extends MinimalEObjectImpl.Container implem
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TAPPLICABLE_SERVICES__SERVICE:
+        case NsdPackage.APPLICABLE_SERVICES__SERVICE:
             return service != null && !service.isEmpty();
-        case NsdPackage.TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
+        case NsdPackage.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF:
             return dataSetMemberOf != null && !dataSetMemberOf.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TApplicableServicesImpl
+} //ApplicableServicesImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AppliesToTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AppliesToTypeImpl.java
index 692819ecc6a283615225c9e0d53903f766eae19c..6192b05073bc99fd38ee91b9be59c82b6bd826bc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AppliesToTypeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AppliesToTypeImpl.java
@@ -21,14 +21,13 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage;
 
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -40,14 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <ul>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AppliesToTypeImpl#getId <em>Id</em>}</li>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AppliesToTypeImpl#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AppliesToTypeImpl#getRelease <em>Release</em>}</li>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AppliesToTypeImpl#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.AppliesToTypeImpl#getVersion <em>Version</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements AppliesToType {
+public class AppliesToTypeImpl extends NSDObjectWithVersionAndReleaseImpl implements AppliesToType {
     /**
      * The default value of the '{@link #getId() <em>Id</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -76,7 +73,7 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
      * @generated
      * @ordered
      */
-    protected static final TPubStage PUBLICATION_STAGE_EDEFAULT = TPubStage.IS;
+    protected static final PubStage PUBLICATION_STAGE_EDEFAULT = PubStage.IS;
 
     /**
      * The cached value of the '{@link #getPublicationStage() <em>Publication Stage</em>}' attribute.
@@ -86,7 +83,7 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
      * @generated
      * @ordered
      */
-    protected TPubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
+    protected PubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
 
     /**
      * This is true if the Publication Stage attribute has been set.
@@ -97,35 +94,6 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
      */
     protected boolean publicationStageESet;
 
-    /**
-     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected static final short RELEASE_EDEFAULT = 1;
-
-    /**
-     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected short release = RELEASE_EDEFAULT;
-
-    /**
-     * This is true if the Release attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean releaseESet;
-
     /**
      * The default value of the '{@link #getRevision() <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -155,35 +123,6 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
      */
     protected boolean revisionESet;
 
-    /**
-     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected static final int VERSION_EDEFAULT = 0;
-
-    /**
-     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected int version = VERSION_EDEFAULT;
-
-    /**
-     * This is true if the Version attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean versionESet;
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -232,7 +171,7 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
      * @generated
      */
     @Override
-    public TPubStage getPublicationStage() {
+    public PubStage getPublicationStage() {
         return publicationStage;
     }
 
@@ -242,8 +181,8 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
      * @generated
      */
     @Override
-    public void setPublicationStage( TPubStage newPublicationStage ) {
-        TPubStage oldPublicationStage = publicationStage;
+    public void setPublicationStage( PubStage newPublicationStage ) {
+        PubStage oldPublicationStage = publicationStage;
         publicationStage = newPublicationStage == null ? PUBLICATION_STAGE_EDEFAULT : newPublicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStageESet = true;
@@ -259,7 +198,7 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
      */
     @Override
     public void unsetPublicationStage() {
-        TPubStage oldPublicationStage = publicationStage;
+        PubStage oldPublicationStage = publicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStage = PUBLICATION_STAGE_EDEFAULT;
         publicationStageESet = false;
@@ -278,56 +217,6 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
         return publicationStageESet;
     }
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public short getRelease() {
-        return release;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void setRelease( short newRelease ) {
-        short oldRelease = release;
-        release = newRelease;
-        boolean oldReleaseESet = releaseESet;
-        releaseESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.APPLIES_TO_TYPE__RELEASE, oldRelease, release, !oldReleaseESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void unsetRelease() {
-        short oldRelease = release;
-        boolean oldReleaseESet = releaseESet;
-        release = RELEASE_EDEFAULT;
-        releaseESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.APPLIES_TO_TYPE__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean isSetRelease() {
-        return releaseESet;
-    }
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -378,56 +267,6 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
         return revisionESet;
     }
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int getVersion() {
-        return version;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void setVersion( int newVersion ) {
-        int oldVersion = version;
-        version = newVersion;
-        boolean oldVersionESet = versionESet;
-        versionESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.APPLIES_TO_TYPE__VERSION, oldVersion, version, !oldVersionESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void unsetVersion() {
-        int oldVersion = version;
-        boolean oldVersionESet = versionESet;
-        version = VERSION_EDEFAULT;
-        versionESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.APPLIES_TO_TYPE__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean isSetVersion() {
-        return versionESet;
-    }
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -440,12 +279,8 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
             return getId();
         case NsdPackage.APPLIES_TO_TYPE__PUBLICATION_STAGE:
             return getPublicationStage();
-        case NsdPackage.APPLIES_TO_TYPE__RELEASE:
-            return getRelease();
         case NsdPackage.APPLIES_TO_TYPE__REVISION:
             return getRevision();
-        case NsdPackage.APPLIES_TO_TYPE__VERSION:
-            return getVersion();
         }
         return super.eGet( featureID, resolve, coreType );
     }
@@ -462,17 +297,11 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
             setId( ( String ) newValue );
             return;
         case NsdPackage.APPLIES_TO_TYPE__PUBLICATION_STAGE:
-            setPublicationStage( ( TPubStage ) newValue );
-            return;
-        case NsdPackage.APPLIES_TO_TYPE__RELEASE:
-            setRelease( ( Short ) newValue );
+            setPublicationStage( ( PubStage ) newValue );
             return;
         case NsdPackage.APPLIES_TO_TYPE__REVISION:
             setRevision( ( String ) newValue );
             return;
-        case NsdPackage.APPLIES_TO_TYPE__VERSION:
-            setVersion( ( Integer ) newValue );
-            return;
         }
         super.eSet( featureID, newValue );
     }
@@ -491,15 +320,9 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
         case NsdPackage.APPLIES_TO_TYPE__PUBLICATION_STAGE:
             unsetPublicationStage();
             return;
-        case NsdPackage.APPLIES_TO_TYPE__RELEASE:
-            unsetRelease();
-            return;
         case NsdPackage.APPLIES_TO_TYPE__REVISION:
             unsetRevision();
             return;
-        case NsdPackage.APPLIES_TO_TYPE__VERSION:
-            unsetVersion();
-            return;
         }
         super.eUnset( featureID );
     }
@@ -516,12 +339,8 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
             return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals( id );
         case NsdPackage.APPLIES_TO_TYPE__PUBLICATION_STAGE:
             return isSetPublicationStage();
-        case NsdPackage.APPLIES_TO_TYPE__RELEASE:
-            return isSetRelease();
         case NsdPackage.APPLIES_TO_TYPE__REVISION:
             return isSetRevision();
-        case NsdPackage.APPLIES_TO_TYPE__VERSION:
-            return isSetVersion();
         }
         return super.eIsSet( featureID );
     }
@@ -543,21 +362,11 @@ public class AppliesToTypeImpl extends MinimalEObjectImpl.Container implements A
             result.append( publicationStage );
         else
             result.append( "<unset>" );
-        result.append( ", release: " );
-        if( releaseESet )
-            result.append( release );
-        else
-            result.append( "<unset>" );
         result.append( ", revision: " );
         if( revisionESet )
             result.append( revision );
         else
             result.append( "<unset>" );
-        result.append( ", version: " );
-        if( versionESet )
-            result.append( version );
-        else
-            result.append( "<unset>" );
         result.append( ')' );
         return result.toString();
     }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TBasicTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java
similarity index 86%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TBasicTypeImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java
index f6e997cc9a6ea04621fa3612532f604551ba3c6d..4503d569c3d85c8cb0277c172d4fe82ecccd49e6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TBasicTypeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -31,19 +31,19 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TBasic Type</b></em>'.
+ * An implementation of the model object '<em><b>Basic Type</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypeImpl#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypeImpl#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypeImpl#getName <em>Name</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBasicType {
+public class BasicTypeImpl extends MinimalEObjectImpl.Container implements BasicType {
     /**
      * The default value of the '{@link #getDescID() <em>Desc ID</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -89,7 +89,7 @@ public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBas
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TBasicTypeImpl() {
+    protected BasicTypeImpl() {
         super();
     }
 
@@ -100,7 +100,7 @@ public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBas
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TBASIC_TYPE;
+        return NsdPackage.Literals.BASIC_TYPE;
     }
 
     /**
@@ -123,7 +123,7 @@ public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBas
         String oldDescID = descID;
         descID = newDescID;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TBASIC_TYPE__DESC_ID, oldDescID, descID ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.BASIC_TYPE__DESC_ID, oldDescID, descID ) );
     }
 
     /**
@@ -146,7 +146,7 @@ public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBas
         String oldName = name;
         name = newName;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TBASIC_TYPE__NAME, oldName, name ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.BASIC_TYPE__NAME, oldName, name ) );
     }
 
     /**
@@ -157,9 +157,9 @@ public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBas
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TBASIC_TYPE__DESC_ID:
+        case NsdPackage.BASIC_TYPE__DESC_ID:
             return getDescID();
-        case NsdPackage.TBASIC_TYPE__NAME:
+        case NsdPackage.BASIC_TYPE__NAME:
             return getName();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -173,10 +173,10 @@ public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBas
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TBASIC_TYPE__DESC_ID:
+        case NsdPackage.BASIC_TYPE__DESC_ID:
             setDescID( ( String ) newValue );
             return;
-        case NsdPackage.TBASIC_TYPE__NAME:
+        case NsdPackage.BASIC_TYPE__NAME:
             setName( ( String ) newValue );
             return;
         }
@@ -191,10 +191,10 @@ public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBas
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TBASIC_TYPE__DESC_ID:
+        case NsdPackage.BASIC_TYPE__DESC_ID:
             setDescID( DESC_ID_EDEFAULT );
             return;
-        case NsdPackage.TBASIC_TYPE__NAME:
+        case NsdPackage.BASIC_TYPE__NAME:
             setName( NAME_EDEFAULT );
             return;
         }
@@ -209,9 +209,9 @@ public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBas
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TBASIC_TYPE__DESC_ID:
+        case NsdPackage.BASIC_TYPE__DESC_ID:
             return DESC_ID_EDEFAULT == null ? descID != null : !DESC_ID_EDEFAULT.equals( descID );
-        case NsdPackage.TBASIC_TYPE__NAME:
+        case NsdPackage.BASIC_TYPE__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
         }
         return super.eIsSet( featureID );
@@ -235,4 +235,4 @@ public class TBasicTypeImpl extends MinimalEObjectImpl.Container implements TBas
         return result.toString();
     }
 
-} //TBasicTypeImpl
+} //BasicTypeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TBasicTypesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypesImpl.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TBasicTypesImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypesImpl.java
index fd61ebb845927b1fb918909061d82c68b94e3d0e..cf65af585dd10bf9017d9535d1f514b4c3cb3b4e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TBasicTypesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypesImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes;
 
 import java.util.Collection;
 
@@ -39,18 +39,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TBasic Types</b></em>'.
+ * An implementation of the model object '<em><b>Basic Types</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TBasicTypesImpl#getBasicType <em>Basic Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.BasicTypesImpl#getBasicType <em>Basic Type</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TBasicTypesImpl extends MinimalEObjectImpl.Container implements TBasicTypes {
+public class BasicTypesImpl extends MinimalEObjectImpl.Container implements BasicTypes {
     /**
      * The cached value of the '{@link #getBasicType() <em>Basic Type</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -59,14 +59,14 @@ public class TBasicTypesImpl extends MinimalEObjectImpl.Container implements TBa
      * @generated
      * @ordered
      */
-    protected EList< TBasicType > basicType;
+    protected EList< BasicType > basicType;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TBasicTypesImpl() {
+    protected BasicTypesImpl() {
         super();
     }
 
@@ -77,7 +77,7 @@ public class TBasicTypesImpl extends MinimalEObjectImpl.Container implements TBa
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TBASIC_TYPES;
+        return NsdPackage.Literals.BASIC_TYPES;
     }
 
     /**
@@ -86,10 +86,10 @@ public class TBasicTypesImpl extends MinimalEObjectImpl.Container implements TBa
      * @generated
      */
     @Override
-    public EList< TBasicType > getBasicType() {
+    public EList< BasicType > getBasicType() {
         if( basicType == null ) {
-            basicType = new EObjectContainmentEList< TBasicType >( TBasicType.class, this,
-                    NsdPackage.TBASIC_TYPES__BASIC_TYPE );
+            basicType = new EObjectContainmentEList< BasicType >( BasicType.class, this,
+                    NsdPackage.BASIC_TYPES__BASIC_TYPE );
         }
         return basicType;
     }
@@ -102,7 +102,7 @@ public class TBasicTypesImpl extends MinimalEObjectImpl.Container implements TBa
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TBASIC_TYPES__BASIC_TYPE:
+        case NsdPackage.BASIC_TYPES__BASIC_TYPE:
             return ( ( InternalEList< ? > ) getBasicType() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -116,7 +116,7 @@ public class TBasicTypesImpl extends MinimalEObjectImpl.Container implements TBa
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TBASIC_TYPES__BASIC_TYPE:
+        case NsdPackage.BASIC_TYPES__BASIC_TYPE:
             return getBasicType();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -131,9 +131,9 @@ public class TBasicTypesImpl extends MinimalEObjectImpl.Container implements TBa
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TBASIC_TYPES__BASIC_TYPE:
+        case NsdPackage.BASIC_TYPES__BASIC_TYPE:
             getBasicType().clear();
-            getBasicType().addAll( ( Collection< ? extends TBasicType > ) newValue );
+            getBasicType().addAll( ( Collection< ? extends BasicType > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -147,7 +147,7 @@ public class TBasicTypesImpl extends MinimalEObjectImpl.Container implements TBa
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TBASIC_TYPES__BASIC_TYPE:
+        case NsdPackage.BASIC_TYPES__BASIC_TYPE:
             getBasicType().clear();
             return;
         }
@@ -162,10 +162,10 @@ public class TBasicTypesImpl extends MinimalEObjectImpl.Container implements TBa
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TBASIC_TYPES__BASIC_TYPE:
+        case NsdPackage.BASIC_TYPES__BASIC_TYPE:
             return basicType != null && !basicType.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TBasicTypesImpl
+} //BasicTypesImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java
similarity index 79%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCDCImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java
index 090629e1cec51442babf4c74094aedaabe1158b2..517c5e9f1396cd56bddefa11bb1c536b35ced29c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCDCImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java
@@ -19,11 +19,11 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject;
 
 import java.util.Collection;
 
@@ -42,25 +42,25 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TCDC</b></em>'.
+ * An implementation of the model object '<em><b>CDC</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl#getSubDataObject <em>Sub Data Object</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl#getDataAttribute <em>Data Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl#getServiceParameter <em>Service Parameter</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl#isEnumParameterized <em>Enum Parameterized</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl#isStatistics <em>Statistics</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl#isTypeKindParameterized <em>Type Kind Parameterized</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCImpl#getVariant <em>Variant</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl#getSubDataObject <em>Sub Data Object</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl#getDataAttribute <em>Data Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl#getServiceParameter <em>Service Parameter</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl#isEnumParameterized <em>Enum Parameterized</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl#isStatistics <em>Statistics</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl#isTypeKindParameterized <em>Type Kind Parameterized</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCImpl#getVariant <em>Variant</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TCDCImpl extends TTitledClassImpl implements TCDC {
+public class CDCImpl extends TitledClassImpl implements CDC {
     /**
      * The cached value of the '{@link #getSubDataObject() <em>Sub Data Object</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -69,7 +69,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      * @generated
      * @ordered
      */
-    protected EList< TSubDataObject > subDataObject;
+    protected EList< SubDataObject > subDataObject;
 
     /**
      * The cached value of the '{@link #getDataAttribute() <em>Data Attribute</em>}' containment reference list.
@@ -79,7 +79,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      * @generated
      * @ordered
      */
-    protected EList< TDataAttribute > dataAttribute;
+    protected EList< DataAttribute > dataAttribute;
 
     /**
      * The cached value of the '{@link #getServiceParameter() <em>Service Parameter</em>}' containment reference.
@@ -89,7 +89,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      * @generated
      * @ordered
      */
-    protected TServiceParameter serviceParameter;
+    protected ServiceParameter serviceParameter;
 
     /**
      * The default value of the '{@link #isEnumParameterized() <em>Enum Parameterized</em>}' attribute.
@@ -223,7 +223,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TCDCImpl() {
+    protected CDCImpl() {
         super();
     }
 
@@ -234,7 +234,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TCDC;
+        return NsdPackage.Literals.CDC;
     }
 
     /**
@@ -243,10 +243,10 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      * @generated
      */
     @Override
-    public EList< TSubDataObject > getSubDataObject() {
+    public EList< SubDataObject > getSubDataObject() {
         if( subDataObject == null ) {
-            subDataObject = new EObjectContainmentEList< TSubDataObject >( TSubDataObject.class, this,
-                    NsdPackage.TCDC__SUB_DATA_OBJECT );
+            subDataObject = new EObjectContainmentEList< SubDataObject >( SubDataObject.class, this,
+                    NsdPackage.CDC__SUB_DATA_OBJECT );
         }
         return subDataObject;
     }
@@ -257,10 +257,10 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      * @generated
      */
     @Override
-    public EList< TDataAttribute > getDataAttribute() {
+    public EList< DataAttribute > getDataAttribute() {
         if( dataAttribute == null ) {
-            dataAttribute = new EObjectContainmentEList< TDataAttribute >( TDataAttribute.class, this,
-                    NsdPackage.TCDC__DATA_ATTRIBUTE );
+            dataAttribute = new EObjectContainmentEList< DataAttribute >( DataAttribute.class, this,
+                    NsdPackage.CDC__DATA_ATTRIBUTE );
         }
         return dataAttribute;
     }
@@ -271,7 +271,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      * @generated
      */
     @Override
-    public TServiceParameter getServiceParameter() {
+    public ServiceParameter getServiceParameter() {
         return serviceParameter;
     }
 
@@ -280,12 +280,12 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetServiceParameter( TServiceParameter newServiceParameter, NotificationChain msgs ) {
-        TServiceParameter oldServiceParameter = serviceParameter;
+    public NotificationChain basicSetServiceParameter( ServiceParameter newServiceParameter, NotificationChain msgs ) {
+        ServiceParameter oldServiceParameter = serviceParameter;
         serviceParameter = newServiceParameter;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TCDC__SERVICE_PARAMETER, oldServiceParameter, newServiceParameter );
+                    NsdPackage.CDC__SERVICE_PARAMETER, oldServiceParameter, newServiceParameter );
             if( msgs == null )
                 msgs = notification;
             else
@@ -300,18 +300,18 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
      * @generated
      */
     @Override
-    public void setServiceParameter( TServiceParameter newServiceParameter ) {
+    public void setServiceParameter( ServiceParameter newServiceParameter ) {
         if( newServiceParameter != serviceParameter ) {
             NotificationChain msgs = null;
             if( serviceParameter != null ) msgs = ( ( InternalEObject ) serviceParameter ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TCDC__SERVICE_PARAMETER, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.CDC__SERVICE_PARAMETER, null, msgs );
             if( newServiceParameter != null ) msgs = ( ( InternalEObject ) newServiceParameter ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TCDC__SERVICE_PARAMETER, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.CDC__SERVICE_PARAMETER, null, msgs );
             msgs = basicSetServiceParameter( newServiceParameter, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCDC__SERVICE_PARAMETER, newServiceParameter, newServiceParameter ) );
+                NsdPackage.CDC__SERVICE_PARAMETER, newServiceParameter, newServiceParameter ) );
     }
 
     /**
@@ -336,7 +336,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
         boolean oldEnumParameterizedESet = enumParameterizedESet;
         enumParameterizedESet = true;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TCDC__ENUM_PARAMETERIZED,
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CDC__ENUM_PARAMETERIZED,
                     oldEnumParameterized, enumParameterized, !oldEnumParameterizedESet ) );
     }
 
@@ -352,7 +352,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
         enumParameterized = ENUM_PARAMETERIZED_EDEFAULT;
         enumParameterizedESet = false;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TCDC__ENUM_PARAMETERIZED,
+            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CDC__ENUM_PARAMETERIZED,
                     oldEnumParameterized, ENUM_PARAMETERIZED_EDEFAULT, oldEnumParameterizedESet ) );
     }
 
@@ -386,7 +386,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
         String oldName = name;
         name = newName;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TCDC__NAME, oldName, name ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CDC__NAME, oldName, name ) );
     }
 
     /**
@@ -411,7 +411,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
         boolean oldStatisticsESet = statisticsESet;
         statisticsESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCDC__STATISTICS, oldStatistics, statistics, !oldStatisticsESet ) );
+                NsdPackage.CDC__STATISTICS, oldStatistics, statistics, !oldStatisticsESet ) );
     }
 
     /**
@@ -426,7 +426,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
         statistics = STATISTICS_EDEFAULT;
         statisticsESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TCDC__STATISTICS, oldStatistics, STATISTICS_EDEFAULT, oldStatisticsESet ) );
+                NsdPackage.CDC__STATISTICS, oldStatistics, STATISTICS_EDEFAULT, oldStatisticsESet ) );
     }
 
     /**
@@ -461,7 +461,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
         boolean oldTypeKindParameterizedESet = typeKindParameterizedESet;
         typeKindParameterizedESet = true;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TCDC__TYPE_KIND_PARAMETERIZED,
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CDC__TYPE_KIND_PARAMETERIZED,
                     oldTypeKindParameterized, typeKindParameterized, !oldTypeKindParameterizedESet ) );
     }
 
@@ -477,7 +477,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
         typeKindParameterized = TYPE_KIND_PARAMETERIZED_EDEFAULT;
         typeKindParameterizedESet = false;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TCDC__TYPE_KIND_PARAMETERIZED,
+            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CDC__TYPE_KIND_PARAMETERIZED,
                     oldTypeKindParameterized, TYPE_KIND_PARAMETERIZED_EDEFAULT, oldTypeKindParameterizedESet ) );
     }
 
@@ -511,7 +511,7 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
         String oldVariant = variant;
         variant = newVariant;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TCDC__VARIANT, oldVariant, variant ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CDC__VARIANT, oldVariant, variant ) );
     }
 
     /**
@@ -522,11 +522,11 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TCDC__SUB_DATA_OBJECT:
+        case NsdPackage.CDC__SUB_DATA_OBJECT:
             return ( ( InternalEList< ? > ) getSubDataObject() ).basicRemove( otherEnd, msgs );
-        case NsdPackage.TCDC__DATA_ATTRIBUTE:
+        case NsdPackage.CDC__DATA_ATTRIBUTE:
             return ( ( InternalEList< ? > ) getDataAttribute() ).basicRemove( otherEnd, msgs );
-        case NsdPackage.TCDC__SERVICE_PARAMETER:
+        case NsdPackage.CDC__SERVICE_PARAMETER:
             return basicSetServiceParameter( null, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -540,21 +540,21 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TCDC__SUB_DATA_OBJECT:
+        case NsdPackage.CDC__SUB_DATA_OBJECT:
             return getSubDataObject();
-        case NsdPackage.TCDC__DATA_ATTRIBUTE:
+        case NsdPackage.CDC__DATA_ATTRIBUTE:
             return getDataAttribute();
-        case NsdPackage.TCDC__SERVICE_PARAMETER:
+        case NsdPackage.CDC__SERVICE_PARAMETER:
             return getServiceParameter();
-        case NsdPackage.TCDC__ENUM_PARAMETERIZED:
+        case NsdPackage.CDC__ENUM_PARAMETERIZED:
             return isEnumParameterized();
-        case NsdPackage.TCDC__NAME:
+        case NsdPackage.CDC__NAME:
             return getName();
-        case NsdPackage.TCDC__STATISTICS:
+        case NsdPackage.CDC__STATISTICS:
             return isStatistics();
-        case NsdPackage.TCDC__TYPE_KIND_PARAMETERIZED:
+        case NsdPackage.CDC__TYPE_KIND_PARAMETERIZED:
             return isTypeKindParameterized();
-        case NsdPackage.TCDC__VARIANT:
+        case NsdPackage.CDC__VARIANT:
             return getVariant();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -569,30 +569,30 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TCDC__SUB_DATA_OBJECT:
+        case NsdPackage.CDC__SUB_DATA_OBJECT:
             getSubDataObject().clear();
-            getSubDataObject().addAll( ( Collection< ? extends TSubDataObject > ) newValue );
+            getSubDataObject().addAll( ( Collection< ? extends SubDataObject > ) newValue );
             return;
-        case NsdPackage.TCDC__DATA_ATTRIBUTE:
+        case NsdPackage.CDC__DATA_ATTRIBUTE:
             getDataAttribute().clear();
-            getDataAttribute().addAll( ( Collection< ? extends TDataAttribute > ) newValue );
+            getDataAttribute().addAll( ( Collection< ? extends DataAttribute > ) newValue );
             return;
-        case NsdPackage.TCDC__SERVICE_PARAMETER:
-            setServiceParameter( ( TServiceParameter ) newValue );
+        case NsdPackage.CDC__SERVICE_PARAMETER:
+            setServiceParameter( ( ServiceParameter ) newValue );
             return;
-        case NsdPackage.TCDC__ENUM_PARAMETERIZED:
+        case NsdPackage.CDC__ENUM_PARAMETERIZED:
             setEnumParameterized( ( Boolean ) newValue );
             return;
-        case NsdPackage.TCDC__NAME:
+        case NsdPackage.CDC__NAME:
             setName( ( String ) newValue );
             return;
-        case NsdPackage.TCDC__STATISTICS:
+        case NsdPackage.CDC__STATISTICS:
             setStatistics( ( Boolean ) newValue );
             return;
-        case NsdPackage.TCDC__TYPE_KIND_PARAMETERIZED:
+        case NsdPackage.CDC__TYPE_KIND_PARAMETERIZED:
             setTypeKindParameterized( ( Boolean ) newValue );
             return;
-        case NsdPackage.TCDC__VARIANT:
+        case NsdPackage.CDC__VARIANT:
             setVariant( ( String ) newValue );
             return;
         }
@@ -607,28 +607,28 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCDC__SUB_DATA_OBJECT:
+        case NsdPackage.CDC__SUB_DATA_OBJECT:
             getSubDataObject().clear();
             return;
-        case NsdPackage.TCDC__DATA_ATTRIBUTE:
+        case NsdPackage.CDC__DATA_ATTRIBUTE:
             getDataAttribute().clear();
             return;
-        case NsdPackage.TCDC__SERVICE_PARAMETER:
-            setServiceParameter( ( TServiceParameter ) null );
+        case NsdPackage.CDC__SERVICE_PARAMETER:
+            setServiceParameter( ( ServiceParameter ) null );
             return;
-        case NsdPackage.TCDC__ENUM_PARAMETERIZED:
+        case NsdPackage.CDC__ENUM_PARAMETERIZED:
             unsetEnumParameterized();
             return;
-        case NsdPackage.TCDC__NAME:
+        case NsdPackage.CDC__NAME:
             setName( NAME_EDEFAULT );
             return;
-        case NsdPackage.TCDC__STATISTICS:
+        case NsdPackage.CDC__STATISTICS:
             unsetStatistics();
             return;
-        case NsdPackage.TCDC__TYPE_KIND_PARAMETERIZED:
+        case NsdPackage.CDC__TYPE_KIND_PARAMETERIZED:
             unsetTypeKindParameterized();
             return;
-        case NsdPackage.TCDC__VARIANT:
+        case NsdPackage.CDC__VARIANT:
             setVariant( VARIANT_EDEFAULT );
             return;
         }
@@ -643,21 +643,21 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCDC__SUB_DATA_OBJECT:
+        case NsdPackage.CDC__SUB_DATA_OBJECT:
             return subDataObject != null && !subDataObject.isEmpty();
-        case NsdPackage.TCDC__DATA_ATTRIBUTE:
+        case NsdPackage.CDC__DATA_ATTRIBUTE:
             return dataAttribute != null && !dataAttribute.isEmpty();
-        case NsdPackage.TCDC__SERVICE_PARAMETER:
+        case NsdPackage.CDC__SERVICE_PARAMETER:
             return serviceParameter != null;
-        case NsdPackage.TCDC__ENUM_PARAMETERIZED:
+        case NsdPackage.CDC__ENUM_PARAMETERIZED:
             return isSetEnumParameterized();
-        case NsdPackage.TCDC__NAME:
+        case NsdPackage.CDC__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
-        case NsdPackage.TCDC__STATISTICS:
+        case NsdPackage.CDC__STATISTICS:
             return isSetStatistics();
-        case NsdPackage.TCDC__TYPE_KIND_PARAMETERIZED:
+        case NsdPackage.CDC__TYPE_KIND_PARAMETERIZED:
             return isSetTypeKindParameterized();
-        case NsdPackage.TCDC__VARIANT:
+        case NsdPackage.CDC__VARIANT:
             return VARIANT_EDEFAULT == null ? variant != null : !VARIANT_EDEFAULT.equals( variant );
         }
         return super.eIsSet( featureID );
@@ -696,4 +696,4 @@ public class TCDCImpl extends TTitledClassImpl implements TCDC {
         return result.toString();
     }
 
-} //TCDCImpl
+} //CDCImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCDCsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCsImpl.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCDCsImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCsImpl.java
index 54e3c389a5f428cec9980695f8b403f09797e49f..b7ff1efc369b4f0050ee157602e62768754dde67 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCDCsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCsImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs;
 
 import java.util.Collection;
 
@@ -39,18 +39,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TCD Cs</b></em>'.
+ * An implementation of the model object '<em><b>CD Cs</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCDCsImpl#getCDC <em>CDC</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CDCsImpl#getCDC <em>CDC</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TCDCsImpl extends MinimalEObjectImpl.Container implements TCDCs {
+public class CDCsImpl extends MinimalEObjectImpl.Container implements CDCs {
     /**
      * The cached value of the '{@link #getCDC() <em>CDC</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -59,14 +59,14 @@ public class TCDCsImpl extends MinimalEObjectImpl.Container implements TCDCs {
      * @generated
      * @ordered
      */
-    protected EList< TCDC > cDC;
+    protected EList< CDC > cDC;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TCDCsImpl() {
+    protected CDCsImpl() {
         super();
     }
 
@@ -77,7 +77,7 @@ public class TCDCsImpl extends MinimalEObjectImpl.Container implements TCDCs {
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TCD_CS;
+        return NsdPackage.Literals.CD_CS;
     }
 
     /**
@@ -86,9 +86,9 @@ public class TCDCsImpl extends MinimalEObjectImpl.Container implements TCDCs {
      * @generated
      */
     @Override
-    public EList< TCDC > getCDC() {
+    public EList< CDC > getCDC() {
         if( cDC == null ) {
-            cDC = new EObjectContainmentEList< TCDC >( TCDC.class, this, NsdPackage.TCD_CS__CDC );
+            cDC = new EObjectContainmentEList< CDC >( CDC.class, this, NsdPackage.CD_CS__CDC );
         }
         return cDC;
     }
@@ -101,7 +101,7 @@ public class TCDCsImpl extends MinimalEObjectImpl.Container implements TCDCs {
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TCD_CS__CDC:
+        case NsdPackage.CD_CS__CDC:
             return ( ( InternalEList< ? > ) getCDC() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -115,7 +115,7 @@ public class TCDCsImpl extends MinimalEObjectImpl.Container implements TCDCs {
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TCD_CS__CDC:
+        case NsdPackage.CD_CS__CDC:
             return getCDC();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -130,9 +130,9 @@ public class TCDCsImpl extends MinimalEObjectImpl.Container implements TCDCs {
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TCD_CS__CDC:
+        case NsdPackage.CD_CS__CDC:
             getCDC().clear();
-            getCDC().addAll( ( Collection< ? extends TCDC > ) newValue );
+            getCDC().addAll( ( Collection< ? extends CDC > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -146,7 +146,7 @@ public class TCDCsImpl extends MinimalEObjectImpl.Container implements TCDCs {
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCD_CS__CDC:
+        case NsdPackage.CD_CS__CDC:
             getCDC().clear();
             return;
         }
@@ -161,10 +161,10 @@ public class TCDCsImpl extends MinimalEObjectImpl.Container implements TCDCs {
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCD_CS__CDC:
+        case NsdPackage.CD_CS__CDC:
             return cDC != null && !cDC.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TCDCsImpl
+} //CDCsImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TChangesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ChangesImpl.java
similarity index 57%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TChangesImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ChangesImpl.java
index 765a9a314cfe2402a692d4b43c220029993b5285..5da44d434ba941507de38bb585e70be060e0a566 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TChangesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ChangesImpl.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
@@ -29,27 +29,24 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TChanges</b></em>'.
+ * An implementation of the model object '<em><b>Changes</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl#getChangesID <em>Changes ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl#getDate <em>Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl#getTissues <em>Tissues</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TChangesImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ChangesImpl#getChangesID <em>Changes ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ChangesImpl#getDate <em>Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ChangesImpl#getRevision <em>Revision</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ChangesImpl#getTissues <em>Tissues</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TChangesImpl extends MinimalEObjectImpl.Container implements TChanges {
+public class ChangesImpl extends NSDObjectWithVersionAndReleaseImpl implements Changes {
     /**
      * The default value of the '{@link #getChangesID() <em>Changes ID</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -90,35 +87,6 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
      */
     protected XMLGregorianCalendar date = DATE_EDEFAULT;
 
-    /**
-     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected static final short RELEASE_EDEFAULT = 1;
-
-    /**
-     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected short release = RELEASE_EDEFAULT;
-
-    /**
-     * This is true if the Release attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean releaseESet;
-
     /**
      * The default value of the '{@link #getRevision() <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -169,40 +137,11 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
     protected String tissues = TISSUES_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getVersion()
      * @generated
-     * @ordered
      */
-    protected static final int VERSION_EDEFAULT = 0;
-
-    /**
-     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected int version = VERSION_EDEFAULT;
-
-    /**
-     * This is true if the Version attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean versionESet;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected TChangesImpl() {
+    protected ChangesImpl() {
         super();
     }
 
@@ -213,7 +152,7 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TCHANGES;
+        return NsdPackage.Literals.CHANGES;
     }
 
     /**
@@ -236,7 +175,7 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
         String oldChangesID = changesID;
         changesID = newChangesID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCHANGES__CHANGES_ID, oldChangesID, changesID ) );
+                NsdPackage.CHANGES__CHANGES_ID, oldChangesID, changesID ) );
     }
 
     /**
@@ -259,57 +198,7 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
         XMLGregorianCalendar oldDate = date;
         date = newDate;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TCHANGES__DATE, oldDate, date ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public short getRelease() {
-        return release;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void setRelease( short newRelease ) {
-        short oldRelease = release;
-        release = newRelease;
-        boolean oldReleaseESet = releaseESet;
-        releaseESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCHANGES__RELEASE, oldRelease, release, !oldReleaseESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void unsetRelease() {
-        short oldRelease = release;
-        boolean oldReleaseESet = releaseESet;
-        release = RELEASE_EDEFAULT;
-        releaseESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TCHANGES__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean isSetRelease() {
-        return releaseESet;
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__DATE, oldDate, date ) );
     }
 
     /**
@@ -334,7 +223,7 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
         boolean oldRevisionESet = revisionESet;
         revisionESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCHANGES__REVISION, oldRevision, revision, !oldRevisionESet ) );
+                NsdPackage.CHANGES__REVISION, oldRevision, revision, !oldRevisionESet ) );
     }
 
     /**
@@ -349,7 +238,7 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
         revision = REVISION_EDEFAULT;
         revisionESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TCHANGES__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
+                NsdPackage.CHANGES__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
     }
 
     /**
@@ -382,57 +271,7 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
         String oldTissues = tissues;
         tissues = newTissues;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TCHANGES__TISSUES, oldTissues, tissues ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int getVersion() {
-        return version;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void setVersion( int newVersion ) {
-        int oldVersion = version;
-        version = newVersion;
-        boolean oldVersionESet = versionESet;
-        versionESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCHANGES__VERSION, oldVersion, version, !oldVersionESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void unsetVersion() {
-        int oldVersion = version;
-        boolean oldVersionESet = versionESet;
-        version = VERSION_EDEFAULT;
-        versionESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TCHANGES__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean isSetVersion() {
-        return versionESet;
+                new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__TISSUES, oldTissues, tissues ) );
     }
 
     /**
@@ -443,18 +282,14 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TCHANGES__CHANGES_ID:
+        case NsdPackage.CHANGES__CHANGES_ID:
             return getChangesID();
-        case NsdPackage.TCHANGES__DATE:
+        case NsdPackage.CHANGES__DATE:
             return getDate();
-        case NsdPackage.TCHANGES__RELEASE:
-            return getRelease();
-        case NsdPackage.TCHANGES__REVISION:
+        case NsdPackage.CHANGES__REVISION:
             return getRevision();
-        case NsdPackage.TCHANGES__TISSUES:
+        case NsdPackage.CHANGES__TISSUES:
             return getTissues();
-        case NsdPackage.TCHANGES__VERSION:
-            return getVersion();
         }
         return super.eGet( featureID, resolve, coreType );
     }
@@ -467,24 +302,18 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TCHANGES__CHANGES_ID:
+        case NsdPackage.CHANGES__CHANGES_ID:
             setChangesID( ( String ) newValue );
             return;
-        case NsdPackage.TCHANGES__DATE:
+        case NsdPackage.CHANGES__DATE:
             setDate( ( XMLGregorianCalendar ) newValue );
             return;
-        case NsdPackage.TCHANGES__RELEASE:
-            setRelease( ( Short ) newValue );
-            return;
-        case NsdPackage.TCHANGES__REVISION:
+        case NsdPackage.CHANGES__REVISION:
             setRevision( ( String ) newValue );
             return;
-        case NsdPackage.TCHANGES__TISSUES:
+        case NsdPackage.CHANGES__TISSUES:
             setTissues( ( String ) newValue );
             return;
-        case NsdPackage.TCHANGES__VERSION:
-            setVersion( ( Integer ) newValue );
-            return;
         }
         super.eSet( featureID, newValue );
     }
@@ -497,24 +326,18 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCHANGES__CHANGES_ID:
+        case NsdPackage.CHANGES__CHANGES_ID:
             setChangesID( CHANGES_ID_EDEFAULT );
             return;
-        case NsdPackage.TCHANGES__DATE:
+        case NsdPackage.CHANGES__DATE:
             setDate( DATE_EDEFAULT );
             return;
-        case NsdPackage.TCHANGES__RELEASE:
-            unsetRelease();
-            return;
-        case NsdPackage.TCHANGES__REVISION:
+        case NsdPackage.CHANGES__REVISION:
             unsetRevision();
             return;
-        case NsdPackage.TCHANGES__TISSUES:
+        case NsdPackage.CHANGES__TISSUES:
             setTissues( TISSUES_EDEFAULT );
             return;
-        case NsdPackage.TCHANGES__VERSION:
-            unsetVersion();
-            return;
         }
         super.eUnset( featureID );
     }
@@ -527,18 +350,14 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCHANGES__CHANGES_ID:
+        case NsdPackage.CHANGES__CHANGES_ID:
             return CHANGES_ID_EDEFAULT == null ? changesID != null : !CHANGES_ID_EDEFAULT.equals( changesID );
-        case NsdPackage.TCHANGES__DATE:
+        case NsdPackage.CHANGES__DATE:
             return DATE_EDEFAULT == null ? date != null : !DATE_EDEFAULT.equals( date );
-        case NsdPackage.TCHANGES__RELEASE:
-            return isSetRelease();
-        case NsdPackage.TCHANGES__REVISION:
+        case NsdPackage.CHANGES__REVISION:
             return isSetRevision();
-        case NsdPackage.TCHANGES__TISSUES:
+        case NsdPackage.CHANGES__TISSUES:
             return TISSUES_EDEFAULT == null ? tissues != null : !TISSUES_EDEFAULT.equals( tissues );
-        case NsdPackage.TCHANGES__VERSION:
-            return isSetVersion();
         }
         return super.eIsSet( featureID );
     }
@@ -557,11 +376,6 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
         result.append( changesID );
         result.append( ", date: " );
         result.append( date );
-        result.append( ", release: " );
-        if( releaseESet )
-            result.append( release );
-        else
-            result.append( "<unset>" );
         result.append( ", revision: " );
         if( revisionESet )
             result.append( revision );
@@ -569,13 +383,8 @@ public class TChangesImpl extends MinimalEObjectImpl.Container implements TChang
             result.append( "<unset>" );
         result.append( ", tissues: " );
         result.append( tissues );
-        result.append( ", version: " );
-        if( versionESet )
-            result.append( version );
-        else
-            result.append( "<unset>" );
         result.append( ')' );
         return result.toString();
     }
 
-} //TChangesImpl
+} //ChangesImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TConstructedAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TConstructedAttributeImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java
index 322e00bb15742b5441049f1089666fbf906c2046..fefd2318fe56da6b9db731bf807607c00e3b8072 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TConstructedAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute;
 
 import java.util.Collection;
 
@@ -40,19 +40,19 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TConstructed Attribute</b></em>'.
+ * An implementation of the model object '<em><b>Constructed Attribute</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributeImpl#getSubDataAttribute <em>Sub Data Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributeImpl#getSubDataAttribute <em>Sub Data Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributeImpl#getName <em>Name</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TConstructedAttributeImpl extends TTitledClassImpl implements TConstructedAttribute {
+public class ConstructedAttributeImpl extends TitledClassImpl implements ConstructedAttribute {
     /**
      * The cached value of the '{@link #getSubDataAttribute() <em>Sub Data Attribute</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -61,7 +61,7 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
      * @generated
      * @ordered
      */
-    protected EList< TSubDataAttribute > subDataAttribute;
+    protected EList< SubDataAttribute > subDataAttribute;
 
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -88,7 +88,7 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TConstructedAttributeImpl() {
+    protected ConstructedAttributeImpl() {
         super();
     }
 
@@ -99,7 +99,7 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TCONSTRUCTED_ATTRIBUTE;
+        return NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE;
     }
 
     /**
@@ -108,10 +108,10 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
      * @generated
      */
     @Override
-    public EList< TSubDataAttribute > getSubDataAttribute() {
+    public EList< SubDataAttribute > getSubDataAttribute() {
         if( subDataAttribute == null ) {
-            subDataAttribute = new EObjectContainmentEList< TSubDataAttribute >( TSubDataAttribute.class, this,
-                    NsdPackage.TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE );
+            subDataAttribute = new EObjectContainmentEList< SubDataAttribute >( SubDataAttribute.class, this,
+                    NsdPackage.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE );
         }
         return subDataAttribute;
     }
@@ -136,7 +136,7 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
         String oldName = name;
         name = newName;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCONSTRUCTED_ATTRIBUTE__NAME, oldName, name ) );
+                NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME, oldName, name ) );
     }
 
     /**
@@ -147,7 +147,7 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
             return ( ( InternalEList< ? > ) getSubDataAttribute() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -161,9 +161,9 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
             return getSubDataAttribute();
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__NAME:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME:
             return getName();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -178,11 +178,11 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
             getSubDataAttribute().clear();
-            getSubDataAttribute().addAll( ( Collection< ? extends TSubDataAttribute > ) newValue );
+            getSubDataAttribute().addAll( ( Collection< ? extends SubDataAttribute > ) newValue );
             return;
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__NAME:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME:
             setName( ( String ) newValue );
             return;
         }
@@ -197,10 +197,10 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
             getSubDataAttribute().clear();
             return;
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__NAME:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME:
             setName( NAME_EDEFAULT );
             return;
         }
@@ -215,9 +215,9 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE:
             return subDataAttribute != null && !subDataAttribute.isEmpty();
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE__NAME:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
         }
         return super.eIsSet( featureID );
@@ -239,4 +239,4 @@ public class TConstructedAttributeImpl extends TTitledClassImpl implements TCons
         return result.toString();
     }
 
-} //TConstructedAttributeImpl
+} //ConstructedAttributeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TConstructedAttributesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributesImpl.java
similarity index 75%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TConstructedAttributesImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributesImpl.java
index f2e450f071efe06693e6847be2a273a03739bc3d..0772915cc21fd5b075371e17eb5655e03a4762ff 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TConstructedAttributesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributesImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes;
 
 import java.util.Collection;
 
@@ -39,18 +39,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TConstructed Attributes</b></em>'.
+ * An implementation of the model object '<em><b>Constructed Attributes</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TConstructedAttributesImpl#getConstructedAttribute <em>Constructed Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ConstructedAttributesImpl#getConstructedAttribute <em>Constructed Attribute</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TConstructedAttributesImpl extends MinimalEObjectImpl.Container implements TConstructedAttributes {
+public class ConstructedAttributesImpl extends MinimalEObjectImpl.Container implements ConstructedAttributes {
     /**
      * The cached value of the '{@link #getConstructedAttribute() <em>Constructed Attribute</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -59,14 +59,14 @@ public class TConstructedAttributesImpl extends MinimalEObjectImpl.Container imp
      * @generated
      * @ordered
      */
-    protected EList< TConstructedAttribute > constructedAttribute;
+    protected EList< ConstructedAttribute > constructedAttribute;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TConstructedAttributesImpl() {
+    protected ConstructedAttributesImpl() {
         super();
     }
 
@@ -77,7 +77,7 @@ public class TConstructedAttributesImpl extends MinimalEObjectImpl.Container imp
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TCONSTRUCTED_ATTRIBUTES;
+        return NsdPackage.Literals.CONSTRUCTED_ATTRIBUTES;
     }
 
     /**
@@ -86,10 +86,10 @@ public class TConstructedAttributesImpl extends MinimalEObjectImpl.Container imp
      * @generated
      */
     @Override
-    public EList< TConstructedAttribute > getConstructedAttribute() {
+    public EList< ConstructedAttribute > getConstructedAttribute() {
         if( constructedAttribute == null ) {
-            constructedAttribute = new EObjectContainmentEList< TConstructedAttribute >( TConstructedAttribute.class,
-                    this, NsdPackage.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE );
+            constructedAttribute = new EObjectContainmentEList< ConstructedAttribute >( ConstructedAttribute.class,
+                    this, NsdPackage.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE );
         }
         return constructedAttribute;
     }
@@ -102,7 +102,7 @@ public class TConstructedAttributesImpl extends MinimalEObjectImpl.Container imp
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
             return ( ( InternalEList< ? > ) getConstructedAttribute() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -116,7 +116,7 @@ public class TConstructedAttributesImpl extends MinimalEObjectImpl.Container imp
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
             return getConstructedAttribute();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -131,9 +131,9 @@ public class TConstructedAttributesImpl extends MinimalEObjectImpl.Container imp
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
             getConstructedAttribute().clear();
-            getConstructedAttribute().addAll( ( Collection< ? extends TConstructedAttribute > ) newValue );
+            getConstructedAttribute().addAll( ( Collection< ? extends ConstructedAttribute > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -147,7 +147,7 @@ public class TConstructedAttributesImpl extends MinimalEObjectImpl.Container imp
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
             getConstructedAttribute().clear();
             return;
         }
@@ -162,10 +162,10 @@ public class TConstructedAttributesImpl extends MinimalEObjectImpl.Container imp
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE:
             return constructedAttribute != null && !constructedAttribute.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TConstructedAttributesImpl
+} //ConstructedAttributesImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCopyrightNoticeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightNoticeImpl.java
similarity index 70%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCopyrightNoticeImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightNoticeImpl.java
index 6e42c9a5d26d3063d627226dd95ad78005acf730..c98b4248f130c00fb400b199bdcb9a71be3bc50c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCopyrightNoticeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightNoticeImpl.java
@@ -19,10 +19,10 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.License;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -35,19 +35,19 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TCopyright Notice</b></em>'.
+ * An implementation of the model object '<em><b>Copyright Notice</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightNoticeImpl#getNotice <em>Notice</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightNoticeImpl#getLicense <em>License</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightNoticeImpl#getNotice <em>Notice</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightNoticeImpl#getLicense <em>License</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implements TCopyrightNotice {
+public class CopyrightNoticeImpl extends MinimalEObjectImpl.Container implements CopyrightNotice {
     /**
      * The cached value of the '{@link #getNotice() <em>Notice</em>}' containment reference.
      * <!-- begin-user-doc -->
@@ -56,7 +56,7 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
      * @generated
      * @ordered
      */
-    protected TNotice notice;
+    protected Notice notice;
 
     /**
      * The cached value of the '{@link #getLicense() <em>License</em>}' containment reference.
@@ -66,14 +66,14 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
      * @generated
      * @ordered
      */
-    protected TLicense license;
+    protected License license;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TCopyrightNoticeImpl() {
+    protected CopyrightNoticeImpl() {
         super();
     }
 
@@ -84,7 +84,7 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TCOPYRIGHT_NOTICE;
+        return NsdPackage.Literals.COPYRIGHT_NOTICE;
     }
 
     /**
@@ -93,7 +93,7 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public TNotice getNotice() {
+    public Notice getNotice() {
         return notice;
     }
 
@@ -102,12 +102,12 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetNotice( TNotice newNotice, NotificationChain msgs ) {
-        TNotice oldNotice = notice;
+    public NotificationChain basicSetNotice( Notice newNotice, NotificationChain msgs ) {
+        Notice oldNotice = notice;
         notice = newNotice;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TCOPYRIGHT_NOTICE__NOTICE, oldNotice, newNotice );
+                    NsdPackage.COPYRIGHT_NOTICE__NOTICE, oldNotice, newNotice );
             if( msgs == null )
                 msgs = notification;
             else
@@ -122,18 +122,18 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void setNotice( TNotice newNotice ) {
+    public void setNotice( Notice newNotice ) {
         if( newNotice != notice ) {
             NotificationChain msgs = null;
             if( notice != null ) msgs = ( ( InternalEObject ) notice ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TCOPYRIGHT_NOTICE__NOTICE, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHT_NOTICE__NOTICE, null, msgs );
             if( newNotice != null ) msgs = ( ( InternalEObject ) newNotice ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TCOPYRIGHT_NOTICE__NOTICE, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHT_NOTICE__NOTICE, null, msgs );
             msgs = basicSetNotice( newNotice, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCOPYRIGHT_NOTICE__NOTICE, newNotice, newNotice ) );
+                NsdPackage.COPYRIGHT_NOTICE__NOTICE, newNotice, newNotice ) );
     }
 
     /**
@@ -142,7 +142,7 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public TLicense getLicense() {
+    public License getLicense() {
         return license;
     }
 
@@ -151,12 +151,12 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetLicense( TLicense newLicense, NotificationChain msgs ) {
-        TLicense oldLicense = license;
+    public NotificationChain basicSetLicense( License newLicense, NotificationChain msgs ) {
+        License oldLicense = license;
         license = newLicense;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TCOPYRIGHT_NOTICE__LICENSE, oldLicense, newLicense );
+                    NsdPackage.COPYRIGHT_NOTICE__LICENSE, oldLicense, newLicense );
             if( msgs == null )
                 msgs = notification;
             else
@@ -171,18 +171,18 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void setLicense( TLicense newLicense ) {
+    public void setLicense( License newLicense ) {
         if( newLicense != license ) {
             NotificationChain msgs = null;
             if( license != null ) msgs = ( ( InternalEObject ) license ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TCOPYRIGHT_NOTICE__LICENSE, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHT_NOTICE__LICENSE, null, msgs );
             if( newLicense != null ) msgs = ( ( InternalEObject ) newLicense ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TCOPYRIGHT_NOTICE__LICENSE, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHT_NOTICE__LICENSE, null, msgs );
             msgs = basicSetLicense( newLicense, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCOPYRIGHT_NOTICE__LICENSE, newLicense, newLicense ) );
+                NsdPackage.COPYRIGHT_NOTICE__LICENSE, newLicense, newLicense ) );
     }
 
     /**
@@ -193,9 +193,9 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHT_NOTICE__NOTICE:
+        case NsdPackage.COPYRIGHT_NOTICE__NOTICE:
             return basicSetNotice( null, msgs );
-        case NsdPackage.TCOPYRIGHT_NOTICE__LICENSE:
+        case NsdPackage.COPYRIGHT_NOTICE__LICENSE:
             return basicSetLicense( null, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -209,9 +209,9 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHT_NOTICE__NOTICE:
+        case NsdPackage.COPYRIGHT_NOTICE__NOTICE:
             return getNotice();
-        case NsdPackage.TCOPYRIGHT_NOTICE__LICENSE:
+        case NsdPackage.COPYRIGHT_NOTICE__LICENSE:
             return getLicense();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -225,11 +225,11 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHT_NOTICE__NOTICE:
-            setNotice( ( TNotice ) newValue );
+        case NsdPackage.COPYRIGHT_NOTICE__NOTICE:
+            setNotice( ( Notice ) newValue );
             return;
-        case NsdPackage.TCOPYRIGHT_NOTICE__LICENSE:
-            setLicense( ( TLicense ) newValue );
+        case NsdPackage.COPYRIGHT_NOTICE__LICENSE:
+            setLicense( ( License ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -243,11 +243,11 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHT_NOTICE__NOTICE:
-            setNotice( ( TNotice ) null );
+        case NsdPackage.COPYRIGHT_NOTICE__NOTICE:
+            setNotice( ( Notice ) null );
             return;
-        case NsdPackage.TCOPYRIGHT_NOTICE__LICENSE:
-            setLicense( ( TLicense ) null );
+        case NsdPackage.COPYRIGHT_NOTICE__LICENSE:
+            setLicense( ( License ) null );
             return;
         }
         super.eUnset( featureID );
@@ -261,12 +261,12 @@ public class TCopyrightNoticeImpl extends MinimalEObjectImpl.Container implement
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHT_NOTICE__NOTICE:
+        case NsdPackage.COPYRIGHT_NOTICE__NOTICE:
             return notice != null;
-        case NsdPackage.TCOPYRIGHT_NOTICE__LICENSE:
+        case NsdPackage.COPYRIGHT_NOTICE__LICENSE:
             return license != null;
         }
         return super.eIsSet( featureID );
     }
 
-} //TCopyrightNoticeImpl
+} //CopyrightNoticeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCopyrightedImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightedImpl.java
similarity index 74%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCopyrightedImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightedImpl.java
index ff2e8ee46cb8e56ee33e5f959ec51c8fcf670706..8e1ebbc37a12de899f228a5f5fb7986ae972ff72 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TCopyrightedImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightedImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -34,18 +34,18 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TCopyrighted</b></em>'.
+ * An implementation of the model object '<em><b>Copyrighted</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TCopyrightedImpl#getCopyright <em>Copyright</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.CopyrightedImpl#getCopyright <em>Copyright</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TCopyrighted {
+public class CopyrightedImpl extends MinimalEObjectImpl.Container implements Copyrighted {
     /**
      * The cached value of the '{@link #getCopyright() <em>Copyright</em>}' containment reference.
      * <!-- begin-user-doc -->
@@ -54,14 +54,14 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
      * @generated
      * @ordered
      */
-    protected TCopyrightNotice copyright;
+    protected CopyrightNotice copyright;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TCopyrightedImpl() {
+    protected CopyrightedImpl() {
         super();
     }
 
@@ -72,7 +72,7 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TCOPYRIGHTED;
+        return NsdPackage.Literals.COPYRIGHTED;
     }
 
     /**
@@ -81,7 +81,7 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
      * @generated
      */
     @Override
-    public TCopyrightNotice getCopyright() {
+    public CopyrightNotice getCopyright() {
         return copyright;
     }
 
@@ -90,12 +90,12 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetCopyright( TCopyrightNotice newCopyright, NotificationChain msgs ) {
-        TCopyrightNotice oldCopyright = copyright;
+    public NotificationChain basicSetCopyright( CopyrightNotice newCopyright, NotificationChain msgs ) {
+        CopyrightNotice oldCopyright = copyright;
         copyright = newCopyright;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TCOPYRIGHTED__COPYRIGHT, oldCopyright, newCopyright );
+                    NsdPackage.COPYRIGHTED__COPYRIGHT, oldCopyright, newCopyright );
             if( msgs == null )
                 msgs = notification;
             else
@@ -110,18 +110,18 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
      * @generated
      */
     @Override
-    public void setCopyright( TCopyrightNotice newCopyright ) {
+    public void setCopyright( CopyrightNotice newCopyright ) {
         if( newCopyright != copyright ) {
             NotificationChain msgs = null;
             if( copyright != null ) msgs = ( ( InternalEObject ) copyright ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TCOPYRIGHTED__COPYRIGHT, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHTED__COPYRIGHT, null, msgs );
             if( newCopyright != null ) msgs = ( ( InternalEObject ) newCopyright ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TCOPYRIGHTED__COPYRIGHT, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHTED__COPYRIGHT, null, msgs );
             msgs = basicSetCopyright( newCopyright, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TCOPYRIGHTED__COPYRIGHT, newCopyright, newCopyright ) );
+                NsdPackage.COPYRIGHTED__COPYRIGHT, newCopyright, newCopyright ) );
     }
 
     /**
@@ -132,7 +132,7 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHTED__COPYRIGHT:
+        case NsdPackage.COPYRIGHTED__COPYRIGHT:
             return basicSetCopyright( null, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -146,7 +146,7 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHTED__COPYRIGHT:
+        case NsdPackage.COPYRIGHTED__COPYRIGHT:
             return getCopyright();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -160,8 +160,8 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHTED__COPYRIGHT:
-            setCopyright( ( TCopyrightNotice ) newValue );
+        case NsdPackage.COPYRIGHTED__COPYRIGHT:
+            setCopyright( ( CopyrightNotice ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -175,8 +175,8 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHTED__COPYRIGHT:
-            setCopyright( ( TCopyrightNotice ) null );
+        case NsdPackage.COPYRIGHTED__COPYRIGHT:
+            setCopyright( ( CopyrightNotice ) null );
             return;
         }
         super.eUnset( featureID );
@@ -190,10 +190,10 @@ public class TCopyrightedImpl extends MinimalEObjectImpl.Container implements TC
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TCOPYRIGHTED__COPYRIGHT:
+        case NsdPackage.COPYRIGHTED__COPYRIGHT:
             return copyright != null;
         }
         return super.eIsSet( featureID );
     }
 
-} //TCopyrightedImpl
+} //CopyrightedImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java
similarity index 82%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDataAttributeImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java
index e7d53be22a5a576d8cbf5df3f7e22b59ed46a162..a11aaf994e838874bc2bd1055d5dbe13b3e5f2f2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDataAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute;
 
 import java.math.BigDecimal;
 
@@ -35,34 +35,34 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TData Attribute</b></em>'.
+ * An implementation of the model object '<em><b>Data Attribute</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#isDchg <em>Dchg</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#isDupd <em>Dupd</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getFc <em>Fc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#isIsArray <em>Is Array</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getMaxValue <em>Max Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getMinIndex <em>Min Index</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getMinValue <em>Min Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#isQchg <em>Qchg</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getSizeAttribute <em>Size Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataAttributeImpl#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#isDchg <em>Dchg</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getDefaultValue <em>Default Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#isDupd <em>Dupd</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getFc <em>Fc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#isIsArray <em>Is Array</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getMaxValue <em>Max Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getMinIndex <em>Min Index</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getMinValue <em>Min Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#isQchg <em>Qchg</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getSizeAttribute <em>Size Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataAttributeImpl#getTypeKind <em>Type Kind</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAttribute {
+public class DataAttributeImpl extends DocumentedClassImpl implements DataAttribute {
     /**
      * The default value of the '{@link #isDchg() <em>Dchg</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -446,7 +446,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
      * @ordered
      */
     protected static final Enumerator TYPE_KIND_EDEFAULT = ( Enumerator ) NsdFactory.eINSTANCE
-            .createFromString( NsdPackage.eINSTANCE.getTAttributeTypeKind(), "BASIC" );
+            .createFromString( NsdPackage.eINSTANCE.getAttributeTypeKind(), "BASIC" );
 
     /**
      * The cached value of the '{@link #getTypeKind() <em>Type Kind</em>}' attribute.
@@ -472,7 +472,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDataAttributeImpl() {
+    protected DataAttributeImpl() {
         super();
     }
 
@@ -483,7 +483,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TDATA_ATTRIBUTE;
+        return NsdPackage.Literals.DATA_ATTRIBUTE;
     }
 
     /**
@@ -508,7 +508,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         boolean oldDchgESet = dchgESet;
         dchgESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__DCHG, oldDchg, dchg, !oldDchgESet ) );
+                NsdPackage.DATA_ATTRIBUTE__DCHG, oldDchg, dchg, !oldDchgESet ) );
     }
 
     /**
@@ -523,7 +523,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         dchg = DCHG_EDEFAULT;
         dchgESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_ATTRIBUTE__DCHG, oldDchg, DCHG_EDEFAULT, oldDchgESet ) );
+                NsdPackage.DATA_ATTRIBUTE__DCHG, oldDchg, DCHG_EDEFAULT, oldDchgESet ) );
     }
 
     /**
@@ -556,7 +556,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         String oldDefaultValue = defaultValue;
         defaultValue = newDefaultValue;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__DEFAULT_VALUE, oldDefaultValue, defaultValue ) );
+                NsdPackage.DATA_ATTRIBUTE__DEFAULT_VALUE, oldDefaultValue, defaultValue ) );
     }
 
     /**
@@ -581,7 +581,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         boolean oldDupdESet = dupdESet;
         dupdESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__DUPD, oldDupd, dupd, !oldDupdESet ) );
+                NsdPackage.DATA_ATTRIBUTE__DUPD, oldDupd, dupd, !oldDupdESet ) );
     }
 
     /**
@@ -596,7 +596,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         dupd = DUPD_EDEFAULT;
         dupdESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_ATTRIBUTE__DUPD, oldDupd, DUPD_EDEFAULT, oldDupdESet ) );
+                NsdPackage.DATA_ATTRIBUTE__DUPD, oldDupd, DUPD_EDEFAULT, oldDupdESet ) );
     }
 
     /**
@@ -629,7 +629,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         String oldFc = fc;
         fc = newFc;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TDATA_ATTRIBUTE__FC, oldFc, fc ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__FC, oldFc, fc ) );
     }
 
     /**
@@ -654,7 +654,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         boolean oldIsArrayESet = isArrayESet;
         isArrayESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) );
+                NsdPackage.DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) );
     }
 
     /**
@@ -669,7 +669,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         isArray = IS_ARRAY_EDEFAULT;
         isArrayESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_ATTRIBUTE__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) );
+                NsdPackage.DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) );
     }
 
     /**
@@ -702,7 +702,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         String oldMaxIndexAttribute = maxIndexAttribute;
         maxIndexAttribute = newMaxIndexAttribute;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, oldMaxIndexAttribute, maxIndexAttribute ) );
+                NsdPackage.DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, oldMaxIndexAttribute, maxIndexAttribute ) );
     }
 
     /**
@@ -725,7 +725,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         BigDecimal oldMaxValue = maxValue;
         maxValue = newMaxValue;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, maxValue ) );
+                NsdPackage.DATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, maxValue ) );
     }
 
     /**
@@ -750,7 +750,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         boolean oldMinIndexESet = minIndexESet;
         minIndexESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) );
+                NsdPackage.DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) );
     }
 
     /**
@@ -765,7 +765,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         minIndex = MIN_INDEX_EDEFAULT;
         minIndexESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) );
+                NsdPackage.DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) );
     }
 
     /**
@@ -798,7 +798,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         BigDecimal oldMinValue = minValue;
         minValue = newMinValue;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__MIN_VALUE, oldMinValue, minValue ) );
+                NsdPackage.DATA_ATTRIBUTE__MIN_VALUE, oldMinValue, minValue ) );
     }
 
     /**
@@ -821,7 +821,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         String oldName = name;
         name = newName;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TDATA_ATTRIBUTE__NAME, oldName, name ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__NAME, oldName, name ) );
     }
 
     /**
@@ -846,7 +846,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         boolean oldPresCondESet = presCondESet;
         presCondESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
+                NsdPackage.DATA_ATTRIBUTE__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
     }
 
     /**
@@ -861,7 +861,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         presCond = PRES_COND_EDEFAULT;
         presCondESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_ATTRIBUTE__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
+                NsdPackage.DATA_ATTRIBUTE__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
     }
 
     /**
@@ -894,7 +894,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         String oldPresCondArgs = presCondArgs;
         presCondArgs = newPresCondArgs;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
+                NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
     }
 
     /**
@@ -917,7 +917,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         String oldPresCondArgsID = presCondArgsID;
         presCondArgsID = newPresCondArgsID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
+                NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
     }
 
     /**
@@ -942,7 +942,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         boolean oldQchgESet = qchgESet;
         qchgESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__QCHG, oldQchg, qchg, !oldQchgESet ) );
+                NsdPackage.DATA_ATTRIBUTE__QCHG, oldQchg, qchg, !oldQchgESet ) );
     }
 
     /**
@@ -957,7 +957,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         qchg = QCHG_EDEFAULT;
         qchgESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_ATTRIBUTE__QCHG, oldQchg, QCHG_EDEFAULT, oldQchgESet ) );
+                NsdPackage.DATA_ATTRIBUTE__QCHG, oldQchg, QCHG_EDEFAULT, oldQchgESet ) );
     }
 
     /**
@@ -990,7 +990,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         String oldSizeAttribute = sizeAttribute;
         sizeAttribute = newSizeAttribute;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__SIZE_ATTRIBUTE, oldSizeAttribute, sizeAttribute ) );
+                NsdPackage.DATA_ATTRIBUTE__SIZE_ATTRIBUTE, oldSizeAttribute, sizeAttribute ) );
     }
 
     /**
@@ -1013,7 +1013,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         String oldType = type;
         type = newType;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TDATA_ATTRIBUTE__TYPE, oldType, type ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__TYPE, oldType, type ) );
     }
 
     /**
@@ -1038,7 +1038,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         boolean oldTypeKindESet = typeKindESet;
         typeKindESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
+                NsdPackage.DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
     }
 
     /**
@@ -1053,7 +1053,7 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         typeKind = TYPE_KIND_EDEFAULT;
         typeKindESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
+                NsdPackage.DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
     }
 
     /**
@@ -1074,39 +1074,39 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_ATTRIBUTE__DCHG:
+        case NsdPackage.DATA_ATTRIBUTE__DCHG:
             return isDchg();
-        case NsdPackage.TDATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__DEFAULT_VALUE:
             return getDefaultValue();
-        case NsdPackage.TDATA_ATTRIBUTE__DUPD:
+        case NsdPackage.DATA_ATTRIBUTE__DUPD:
             return isDupd();
-        case NsdPackage.TDATA_ATTRIBUTE__FC:
+        case NsdPackage.DATA_ATTRIBUTE__FC:
             return getFc();
-        case NsdPackage.TDATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.DATA_ATTRIBUTE__IS_ARRAY:
             return isIsArray();
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
             return getMaxIndexAttribute();
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_VALUE:
             return getMaxValue();
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_INDEX:
             return getMinIndex();
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_VALUE:
             return getMinValue();
-        case NsdPackage.TDATA_ATTRIBUTE__NAME:
+        case NsdPackage.DATA_ATTRIBUTE__NAME:
             return getName();
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND:
             return getPresCond();
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS:
             return getPresCondArgs();
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             return getPresCondArgsID();
-        case NsdPackage.TDATA_ATTRIBUTE__QCHG:
+        case NsdPackage.DATA_ATTRIBUTE__QCHG:
             return isQchg();
-        case NsdPackage.TDATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
             return getSizeAttribute();
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE:
             return getType();
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE_KIND:
             return getTypeKind();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -1120,55 +1120,55 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_ATTRIBUTE__DCHG:
+        case NsdPackage.DATA_ATTRIBUTE__DCHG:
             setDchg( ( Boolean ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__DEFAULT_VALUE:
             setDefaultValue( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__DUPD:
+        case NsdPackage.DATA_ATTRIBUTE__DUPD:
             setDupd( ( Boolean ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__FC:
+        case NsdPackage.DATA_ATTRIBUTE__FC:
             setFc( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.DATA_ATTRIBUTE__IS_ARRAY:
             setIsArray( ( Boolean ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
             setMaxIndexAttribute( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_VALUE:
             setMaxValue( ( BigDecimal ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_INDEX:
             setMinIndex( ( Long ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_VALUE:
             setMinValue( ( BigDecimal ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__NAME:
+        case NsdPackage.DATA_ATTRIBUTE__NAME:
             setName( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND:
             setPresCond( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS:
             setPresCondArgs( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             setPresCondArgsID( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__QCHG:
+        case NsdPackage.DATA_ATTRIBUTE__QCHG:
             setQchg( ( Boolean ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
             setSizeAttribute( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE:
             setType( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE_KIND:
             setTypeKind( ( Enumerator ) newValue );
             return;
         }
@@ -1183,55 +1183,55 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_ATTRIBUTE__DCHG:
+        case NsdPackage.DATA_ATTRIBUTE__DCHG:
             unsetDchg();
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__DEFAULT_VALUE:
             setDefaultValue( DEFAULT_VALUE_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__DUPD:
+        case NsdPackage.DATA_ATTRIBUTE__DUPD:
             unsetDupd();
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__FC:
+        case NsdPackage.DATA_ATTRIBUTE__FC:
             setFc( FC_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.DATA_ATTRIBUTE__IS_ARRAY:
             unsetIsArray();
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
             setMaxIndexAttribute( MAX_INDEX_ATTRIBUTE_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_VALUE:
             setMaxValue( MAX_VALUE_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_INDEX:
             unsetMinIndex();
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_VALUE:
             setMinValue( MIN_VALUE_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__NAME:
+        case NsdPackage.DATA_ATTRIBUTE__NAME:
             setName( NAME_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND:
             unsetPresCond();
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS:
             setPresCondArgs( PRES_COND_ARGS_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             setPresCondArgsID( PRES_COND_ARGS_ID_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__QCHG:
+        case NsdPackage.DATA_ATTRIBUTE__QCHG:
             unsetQchg();
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
             setSizeAttribute( SIZE_ATTRIBUTE_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE:
             setType( TYPE_EDEFAULT );
             return;
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE_KIND:
             unsetTypeKind();
             return;
         }
@@ -1246,44 +1246,44 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_ATTRIBUTE__DCHG:
+        case NsdPackage.DATA_ATTRIBUTE__DCHG:
             return isSetDchg();
-        case NsdPackage.TDATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__DEFAULT_VALUE:
             return DEFAULT_VALUE_EDEFAULT == null ? defaultValue != null
                     : !DEFAULT_VALUE_EDEFAULT.equals( defaultValue );
-        case NsdPackage.TDATA_ATTRIBUTE__DUPD:
+        case NsdPackage.DATA_ATTRIBUTE__DUPD:
             return isSetDupd();
-        case NsdPackage.TDATA_ATTRIBUTE__FC:
+        case NsdPackage.DATA_ATTRIBUTE__FC:
             return FC_EDEFAULT == null ? fc != null : !FC_EDEFAULT.equals( fc );
-        case NsdPackage.TDATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.DATA_ATTRIBUTE__IS_ARRAY:
             return isSetIsArray();
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
             return MAX_INDEX_ATTRIBUTE_EDEFAULT == null ? maxIndexAttribute != null
                     : !MAX_INDEX_ATTRIBUTE_EDEFAULT.equals( maxIndexAttribute );
-        case NsdPackage.TDATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__MAX_VALUE:
             return MAX_VALUE_EDEFAULT == null ? maxValue != null : !MAX_VALUE_EDEFAULT.equals( maxValue );
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_INDEX:
             return isSetMinIndex();
-        case NsdPackage.TDATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.DATA_ATTRIBUTE__MIN_VALUE:
             return MIN_VALUE_EDEFAULT == null ? minValue != null : !MIN_VALUE_EDEFAULT.equals( minValue );
-        case NsdPackage.TDATA_ATTRIBUTE__NAME:
+        case NsdPackage.DATA_ATTRIBUTE__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND:
             return isSetPresCond();
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS:
             return PRES_COND_ARGS_EDEFAULT == null ? presCondArgs != null
                     : !PRES_COND_ARGS_EDEFAULT.equals( presCondArgs );
-        case NsdPackage.TDATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             return PRES_COND_ARGS_ID_EDEFAULT == null ? presCondArgsID != null
                     : !PRES_COND_ARGS_ID_EDEFAULT.equals( presCondArgsID );
-        case NsdPackage.TDATA_ATTRIBUTE__QCHG:
+        case NsdPackage.DATA_ATTRIBUTE__QCHG:
             return isSetQchg();
-        case NsdPackage.TDATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
             return SIZE_ATTRIBUTE_EDEFAULT == null ? sizeAttribute != null
                     : !SIZE_ATTRIBUTE_EDEFAULT.equals( sizeAttribute );
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE:
             return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals( type );
-        case NsdPackage.TDATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.DATA_ATTRIBUTE__TYPE_KIND:
             return isSetTypeKind();
         }
         return super.eIsSet( featureID );
@@ -1358,4 +1358,4 @@ public class TDataAttributeImpl extends TDocumentedClassImpl implements TDataAtt
         return result.toString();
     }
 
-} //TDataAttributeImpl
+} //DataAttributeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDataObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDataObjectImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java
index 002af69add3609201b8c6b0b7e78d86de86e4b5e..29900d5766e8b6af854b868fefca1272f3695e9f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDataObjectImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -31,28 +31,28 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TData Object</b></em>'.
+ * An implementation of the model object '<em><b>Data Object</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getDsPresCond <em>Ds Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getDsPresCondArgs <em>Ds Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getDsPresCondArgsID <em>Ds Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#isTransient <em>Transient</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getUnderlyingType <em>Underlying Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataObjectImpl#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getDsPresCond <em>Ds Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getDsPresCondArgs <em>Ds Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getDsPresCondArgsID <em>Ds Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#isTransient <em>Transient</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getUnderlyingType <em>Underlying Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataObjectImpl#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject {
+public class DataObjectImpl extends DocumentedClassImpl implements DataObject {
     /**
      * The default value of the '{@link #getDsPresCond() <em>Ds Pres Cond</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
      * @generated
      * @ordered
      */
-    protected static final TDefinedAttributeTypeKind UNDERLYING_TYPE_KIND_EDEFAULT = TDefinedAttributeTypeKind.BASIC;
+    protected static final DefinedAttributeTypeKind UNDERLYING_TYPE_KIND_EDEFAULT = DefinedAttributeTypeKind.BASIC;
 
     /**
      * The cached value of the '{@link #getUnderlyingTypeKind() <em>Underlying Type Kind</em>}' attribute.
@@ -298,7 +298,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
      * @generated
      * @ordered
      */
-    protected TDefinedAttributeTypeKind underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT;
+    protected DefinedAttributeTypeKind underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT;
 
     /**
      * This is true if the Underlying Type Kind attribute has been set.
@@ -314,7 +314,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDataObjectImpl() {
+    protected DataObjectImpl() {
         super();
     }
 
@@ -325,7 +325,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TDATA_OBJECT;
+        return NsdPackage.Literals.DATA_OBJECT;
     }
 
     /**
@@ -350,7 +350,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         boolean oldDsPresCondESet = dsPresCondESet;
         dsPresCondESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_OBJECT__DS_PRES_COND, oldDsPresCond, dsPresCond, !oldDsPresCondESet ) );
+                NsdPackage.DATA_OBJECT__DS_PRES_COND, oldDsPresCond, dsPresCond, !oldDsPresCondESet ) );
     }
 
     /**
@@ -365,7 +365,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         dsPresCond = DS_PRES_COND_EDEFAULT;
         dsPresCondESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_OBJECT__DS_PRES_COND, oldDsPresCond, DS_PRES_COND_EDEFAULT, oldDsPresCondESet ) );
+                NsdPackage.DATA_OBJECT__DS_PRES_COND, oldDsPresCond, DS_PRES_COND_EDEFAULT, oldDsPresCondESet ) );
     }
 
     /**
@@ -398,7 +398,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         String oldDsPresCondArgs = dsPresCondArgs;
         dsPresCondArgs = newDsPresCondArgs;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS, oldDsPresCondArgs, dsPresCondArgs ) );
+                NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS, oldDsPresCondArgs, dsPresCondArgs ) );
     }
 
     /**
@@ -421,7 +421,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         String oldDsPresCondArgsID = dsPresCondArgsID;
         dsPresCondArgsID = newDsPresCondArgsID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS_ID, oldDsPresCondArgsID, dsPresCondArgsID ) );
+                NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS_ID, oldDsPresCondArgsID, dsPresCondArgsID ) );
     }
 
     /**
@@ -444,7 +444,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         String oldName = name;
         name = newName;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TDATA_OBJECT__NAME, oldName, name ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__NAME, oldName, name ) );
     }
 
     /**
@@ -469,7 +469,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         boolean oldPresCondESet = presCondESet;
         presCondESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_OBJECT__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
+                NsdPackage.DATA_OBJECT__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
     }
 
     /**
@@ -484,7 +484,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         presCond = PRES_COND_EDEFAULT;
         presCondESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_OBJECT__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
+                NsdPackage.DATA_OBJECT__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
     }
 
     /**
@@ -517,7 +517,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         String oldPresCondArgs = presCondArgs;
         presCondArgs = newPresCondArgs;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_OBJECT__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
+                NsdPackage.DATA_OBJECT__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
     }
 
     /**
@@ -540,7 +540,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         String oldPresCondArgsID = presCondArgsID;
         presCondArgsID = newPresCondArgsID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_OBJECT__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
+                NsdPackage.DATA_OBJECT__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
     }
 
     /**
@@ -565,7 +565,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         boolean oldTransientESet = transientESet;
         transientESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_OBJECT__TRANSIENT, oldTransient, transient_, !oldTransientESet ) );
+                NsdPackage.DATA_OBJECT__TRANSIENT, oldTransient, transient_, !oldTransientESet ) );
     }
 
     /**
@@ -580,7 +580,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         transient_ = TRANSIENT_EDEFAULT;
         transientESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_OBJECT__TRANSIENT, oldTransient, TRANSIENT_EDEFAULT, oldTransientESet ) );
+                NsdPackage.DATA_OBJECT__TRANSIENT, oldTransient, TRANSIENT_EDEFAULT, oldTransientESet ) );
     }
 
     /**
@@ -613,7 +613,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         String oldType = type;
         type = newType;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TDATA_OBJECT__TYPE, oldType, type ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__TYPE, oldType, type ) );
     }
 
     /**
@@ -636,7 +636,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         String oldUnderlyingType = underlyingType;
         underlyingType = newUnderlyingType;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE, oldUnderlyingType, underlyingType ) );
+                NsdPackage.DATA_OBJECT__UNDERLYING_TYPE, oldUnderlyingType, underlyingType ) );
     }
 
     /**
@@ -645,7 +645,7 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
      * @generated
      */
     @Override
-    public TDefinedAttributeTypeKind getUnderlyingTypeKind() {
+    public DefinedAttributeTypeKind getUnderlyingTypeKind() {
         return underlyingTypeKind;
     }
 
@@ -655,13 +655,13 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
      * @generated
      */
     @Override
-    public void setUnderlyingTypeKind( TDefinedAttributeTypeKind newUnderlyingTypeKind ) {
-        TDefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
+    public void setUnderlyingTypeKind( DefinedAttributeTypeKind newUnderlyingTypeKind ) {
+        DefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
         underlyingTypeKind = newUnderlyingTypeKind == null ? UNDERLYING_TYPE_KIND_EDEFAULT : newUnderlyingTypeKind;
         boolean oldUnderlyingTypeKindESet = underlyingTypeKindESet;
         underlyingTypeKindESet = true;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE_KIND,
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__UNDERLYING_TYPE_KIND,
                     oldUnderlyingTypeKind, underlyingTypeKind, !oldUnderlyingTypeKindESet ) );
     }
 
@@ -672,12 +672,12 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
      */
     @Override
     public void unsetUnderlyingTypeKind() {
-        TDefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
+        DefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
         boolean oldUnderlyingTypeKindESet = underlyingTypeKindESet;
         underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT;
         underlyingTypeKindESet = false;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE_KIND,
+            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_OBJECT__UNDERLYING_TYPE_KIND,
                     oldUnderlyingTypeKind, UNDERLYING_TYPE_KIND_EDEFAULT, oldUnderlyingTypeKindESet ) );
     }
 
@@ -699,27 +699,27 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND:
             return getDsPresCond();
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS:
             return getDsPresCondArgs();
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS_ID:
             return getDsPresCondArgsID();
-        case NsdPackage.TDATA_OBJECT__NAME:
+        case NsdPackage.DATA_OBJECT__NAME:
             return getName();
-        case NsdPackage.TDATA_OBJECT__PRES_COND:
+        case NsdPackage.DATA_OBJECT__PRES_COND:
             return getPresCond();
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS:
             return getPresCondArgs();
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS_ID:
             return getPresCondArgsID();
-        case NsdPackage.TDATA_OBJECT__TRANSIENT:
+        case NsdPackage.DATA_OBJECT__TRANSIENT:
             return isTransient();
-        case NsdPackage.TDATA_OBJECT__TYPE:
+        case NsdPackage.DATA_OBJECT__TYPE:
             return getType();
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE:
             return getUnderlyingType();
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE_KIND:
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE_KIND:
             return getUnderlyingTypeKind();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -733,38 +733,38 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND:
             setDsPresCond( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS:
             setDsPresCondArgs( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS_ID:
             setDsPresCondArgsID( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__NAME:
+        case NsdPackage.DATA_OBJECT__NAME:
             setName( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__PRES_COND:
+        case NsdPackage.DATA_OBJECT__PRES_COND:
             setPresCond( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS:
             setPresCondArgs( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS_ID:
             setPresCondArgsID( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__TRANSIENT:
+        case NsdPackage.DATA_OBJECT__TRANSIENT:
             setTransient( ( Boolean ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__TYPE:
+        case NsdPackage.DATA_OBJECT__TYPE:
             setType( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE:
             setUnderlyingType( ( String ) newValue );
             return;
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE_KIND:
-            setUnderlyingTypeKind( ( TDefinedAttributeTypeKind ) newValue );
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE_KIND:
+            setUnderlyingTypeKind( ( DefinedAttributeTypeKind ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -778,37 +778,37 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND:
             unsetDsPresCond();
             return;
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS:
             setDsPresCondArgs( DS_PRES_COND_ARGS_EDEFAULT );
             return;
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS_ID:
             setDsPresCondArgsID( DS_PRES_COND_ARGS_ID_EDEFAULT );
             return;
-        case NsdPackage.TDATA_OBJECT__NAME:
+        case NsdPackage.DATA_OBJECT__NAME:
             setName( NAME_EDEFAULT );
             return;
-        case NsdPackage.TDATA_OBJECT__PRES_COND:
+        case NsdPackage.DATA_OBJECT__PRES_COND:
             unsetPresCond();
             return;
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS:
             setPresCondArgs( PRES_COND_ARGS_EDEFAULT );
             return;
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS_ID:
             setPresCondArgsID( PRES_COND_ARGS_ID_EDEFAULT );
             return;
-        case NsdPackage.TDATA_OBJECT__TRANSIENT:
+        case NsdPackage.DATA_OBJECT__TRANSIENT:
             unsetTransient();
             return;
-        case NsdPackage.TDATA_OBJECT__TYPE:
+        case NsdPackage.DATA_OBJECT__TYPE:
             setType( TYPE_EDEFAULT );
             return;
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE:
             setUnderlyingType( UNDERLYING_TYPE_EDEFAULT );
             return;
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE_KIND:
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE_KIND:
             unsetUnderlyingTypeKind();
             return;
         }
@@ -823,32 +823,32 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND:
             return isSetDsPresCond();
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS:
             return DS_PRES_COND_ARGS_EDEFAULT == null ? dsPresCondArgs != null
                     : !DS_PRES_COND_ARGS_EDEFAULT.equals( dsPresCondArgs );
-        case NsdPackage.TDATA_OBJECT__DS_PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__DS_PRES_COND_ARGS_ID:
             return DS_PRES_COND_ARGS_ID_EDEFAULT == null ? dsPresCondArgsID != null
                     : !DS_PRES_COND_ARGS_ID_EDEFAULT.equals( dsPresCondArgsID );
-        case NsdPackage.TDATA_OBJECT__NAME:
+        case NsdPackage.DATA_OBJECT__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
-        case NsdPackage.TDATA_OBJECT__PRES_COND:
+        case NsdPackage.DATA_OBJECT__PRES_COND:
             return isSetPresCond();
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS:
             return PRES_COND_ARGS_EDEFAULT == null ? presCondArgs != null
                     : !PRES_COND_ARGS_EDEFAULT.equals( presCondArgs );
-        case NsdPackage.TDATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.DATA_OBJECT__PRES_COND_ARGS_ID:
             return PRES_COND_ARGS_ID_EDEFAULT == null ? presCondArgsID != null
                     : !PRES_COND_ARGS_ID_EDEFAULT.equals( presCondArgsID );
-        case NsdPackage.TDATA_OBJECT__TRANSIENT:
+        case NsdPackage.DATA_OBJECT__TRANSIENT:
             return isSetTransient();
-        case NsdPackage.TDATA_OBJECT__TYPE:
+        case NsdPackage.DATA_OBJECT__TYPE:
             return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals( type );
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE:
             return UNDERLYING_TYPE_EDEFAULT == null ? underlyingType != null
                     : !UNDERLYING_TYPE_EDEFAULT.equals( underlyingType );
-        case NsdPackage.TDATA_OBJECT__UNDERLYING_TYPE_KIND:
+        case NsdPackage.DATA_OBJECT__UNDERLYING_TYPE_KIND:
             return isSetUnderlyingTypeKind();
         }
         return super.eIsSet( featureID );
@@ -902,4 +902,4 @@ public class TDataObjectImpl extends TDocumentedClassImpl implements TDataObject
         return result.toString();
     }
 
-} //TDataObjectImpl
+} //DataObjectImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDataSetMemberOfImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataSetMemberOfImpl.java
similarity index 80%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDataSetMemberOfImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataSetMemberOfImpl.java
index 6195df85d35ef2c137e4ddc248290e91df17c522..b93c683d003d98d5cb748f9240213bd673cb7d1b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDataSetMemberOfImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataSetMemberOfImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -32,18 +32,18 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TData Set Member Of</b></em>'.
+ * An implementation of the model object '<em><b>Data Set Member Of</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDataSetMemberOfImpl#getCb <em>Cb</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DataSetMemberOfImpl#getCb <em>Cb</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implements TDataSetMemberOf {
+public class DataSetMemberOfImpl extends MinimalEObjectImpl.Container implements DataSetMemberOf {
     /**
      * The default value of the '{@link #getCb() <em>Cb</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -52,7 +52,7 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
      * @generated
      * @ordered
      */
-    protected static final TCBKind CB_EDEFAULT = TCBKind.RCB;
+    protected static final CBKind CB_EDEFAULT = CBKind.RCB;
 
     /**
      * The cached value of the '{@link #getCb() <em>Cb</em>}' attribute.
@@ -62,7 +62,7 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
      * @generated
      * @ordered
      */
-    protected TCBKind cb = CB_EDEFAULT;
+    protected CBKind cb = CB_EDEFAULT;
 
     /**
      * This is true if the Cb attribute has been set.
@@ -78,7 +78,7 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDataSetMemberOfImpl() {
+    protected DataSetMemberOfImpl() {
         super();
     }
 
@@ -89,7 +89,7 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TDATA_SET_MEMBER_OF;
+        return NsdPackage.Literals.DATA_SET_MEMBER_OF;
     }
 
     /**
@@ -98,7 +98,7 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public TCBKind getCb() {
+    public CBKind getCb() {
         return cb;
     }
 
@@ -108,13 +108,13 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void setCb( TCBKind newCb ) {
-        TCBKind oldCb = cb;
+    public void setCb( CBKind newCb ) {
+        CBKind oldCb = cb;
         cb = newCb == null ? CB_EDEFAULT : newCb;
         boolean oldCbESet = cbESet;
         cbESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDATA_SET_MEMBER_OF__CB, oldCb, cb, !oldCbESet ) );
+                NsdPackage.DATA_SET_MEMBER_OF__CB, oldCb, cb, !oldCbESet ) );
     }
 
     /**
@@ -124,12 +124,12 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
      */
     @Override
     public void unsetCb() {
-        TCBKind oldCb = cb;
+        CBKind oldCb = cb;
         boolean oldCbESet = cbESet;
         cb = CB_EDEFAULT;
         cbESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDATA_SET_MEMBER_OF__CB, oldCb, CB_EDEFAULT, oldCbESet ) );
+                NsdPackage.DATA_SET_MEMBER_OF__CB, oldCb, CB_EDEFAULT, oldCbESet ) );
     }
 
     /**
@@ -150,7 +150,7 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_SET_MEMBER_OF__CB:
+        case NsdPackage.DATA_SET_MEMBER_OF__CB:
             return getCb();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -164,8 +164,8 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_SET_MEMBER_OF__CB:
-            setCb( ( TCBKind ) newValue );
+        case NsdPackage.DATA_SET_MEMBER_OF__CB:
+            setCb( ( CBKind ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -179,7 +179,7 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_SET_MEMBER_OF__CB:
+        case NsdPackage.DATA_SET_MEMBER_OF__CB:
             unsetCb();
             return;
         }
@@ -194,7 +194,7 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDATA_SET_MEMBER_OF__CB:
+        case NsdPackage.DATA_SET_MEMBER_OF__CB:
             return isSetCb();
         }
         return super.eIsSet( featureID );
@@ -219,4 +219,4 @@ public class TDataSetMemberOfImpl extends MinimalEObjectImpl.Container implement
         return result.toString();
     }
 
-} //TDataSetMemberOfImpl
+} //DataSetMemberOfImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnTypeImpl.java
index 22b15c40faa78d91d24ef637ff932a94eb39a9ef..d7ac589347f7d7f1d8b57aa9bce0e920f77c808c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnTypeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnTypeImpl.java
@@ -21,14 +21,13 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage;
 
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -40,14 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <ul>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DependsOnTypeImpl#getId <em>Id</em>}</li>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DependsOnTypeImpl#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DependsOnTypeImpl#getRelease <em>Release</em>}</li>
  *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DependsOnTypeImpl#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DependsOnTypeImpl#getVersion <em>Version</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements DependsOnType {
+public class DependsOnTypeImpl extends NSDObjectWithVersionAndReleaseImpl implements DependsOnType {
     /**
      * The default value of the '{@link #getId() <em>Id</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -76,7 +73,7 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
      * @generated
      * @ordered
      */
-    protected static final TPubStage PUBLICATION_STAGE_EDEFAULT = TPubStage.IS;
+    protected static final PubStage PUBLICATION_STAGE_EDEFAULT = PubStage.IS;
 
     /**
      * The cached value of the '{@link #getPublicationStage() <em>Publication Stage</em>}' attribute.
@@ -86,7 +83,7 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
      * @generated
      * @ordered
      */
-    protected TPubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
+    protected PubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
 
     /**
      * This is true if the Publication Stage attribute has been set.
@@ -97,35 +94,6 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
      */
     protected boolean publicationStageESet;
 
-    /**
-     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected static final short RELEASE_EDEFAULT = 1;
-
-    /**
-     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected short release = RELEASE_EDEFAULT;
-
-    /**
-     * This is true if the Release attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean releaseESet;
-
     /**
      * The default value of the '{@link #getRevision() <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -155,35 +123,6 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
      */
     protected boolean revisionESet;
 
-    /**
-     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected static final int VERSION_EDEFAULT = 0;
-
-    /**
-     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected int version = VERSION_EDEFAULT;
-
-    /**
-     * This is true if the Version attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean versionESet;
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -232,7 +171,7 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
      * @generated
      */
     @Override
-    public TPubStage getPublicationStage() {
+    public PubStage getPublicationStage() {
         return publicationStage;
     }
 
@@ -242,8 +181,8 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
      * @generated
      */
     @Override
-    public void setPublicationStage( TPubStage newPublicationStage ) {
-        TPubStage oldPublicationStage = publicationStage;
+    public void setPublicationStage( PubStage newPublicationStage ) {
+        PubStage oldPublicationStage = publicationStage;
         publicationStage = newPublicationStage == null ? PUBLICATION_STAGE_EDEFAULT : newPublicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStageESet = true;
@@ -259,7 +198,7 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
      */
     @Override
     public void unsetPublicationStage() {
-        TPubStage oldPublicationStage = publicationStage;
+        PubStage oldPublicationStage = publicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStage = PUBLICATION_STAGE_EDEFAULT;
         publicationStageESet = false;
@@ -278,56 +217,6 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
         return publicationStageESet;
     }
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public short getRelease() {
-        return release;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void setRelease( short newRelease ) {
-        short oldRelease = release;
-        release = newRelease;
-        boolean oldReleaseESet = releaseESet;
-        releaseESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.DEPENDS_ON_TYPE__RELEASE, oldRelease, release, !oldReleaseESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void unsetRelease() {
-        short oldRelease = release;
-        boolean oldReleaseESet = releaseESet;
-        release = RELEASE_EDEFAULT;
-        releaseESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.DEPENDS_ON_TYPE__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean isSetRelease() {
-        return releaseESet;
-    }
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -378,56 +267,6 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
         return revisionESet;
     }
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int getVersion() {
-        return version;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void setVersion( int newVersion ) {
-        int oldVersion = version;
-        version = newVersion;
-        boolean oldVersionESet = versionESet;
-        versionESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.DEPENDS_ON_TYPE__VERSION, oldVersion, version, !oldVersionESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void unsetVersion() {
-        int oldVersion = version;
-        boolean oldVersionESet = versionESet;
-        version = VERSION_EDEFAULT;
-        versionESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.DEPENDS_ON_TYPE__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean isSetVersion() {
-        return versionESet;
-    }
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -440,12 +279,8 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
             return getId();
         case NsdPackage.DEPENDS_ON_TYPE__PUBLICATION_STAGE:
             return getPublicationStage();
-        case NsdPackage.DEPENDS_ON_TYPE__RELEASE:
-            return getRelease();
         case NsdPackage.DEPENDS_ON_TYPE__REVISION:
             return getRevision();
-        case NsdPackage.DEPENDS_ON_TYPE__VERSION:
-            return getVersion();
         }
         return super.eGet( featureID, resolve, coreType );
     }
@@ -462,17 +297,11 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
             setId( ( String ) newValue );
             return;
         case NsdPackage.DEPENDS_ON_TYPE__PUBLICATION_STAGE:
-            setPublicationStage( ( TPubStage ) newValue );
-            return;
-        case NsdPackage.DEPENDS_ON_TYPE__RELEASE:
-            setRelease( ( Short ) newValue );
+            setPublicationStage( ( PubStage ) newValue );
             return;
         case NsdPackage.DEPENDS_ON_TYPE__REVISION:
             setRevision( ( String ) newValue );
             return;
-        case NsdPackage.DEPENDS_ON_TYPE__VERSION:
-            setVersion( ( Integer ) newValue );
-            return;
         }
         super.eSet( featureID, newValue );
     }
@@ -491,15 +320,9 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
         case NsdPackage.DEPENDS_ON_TYPE__PUBLICATION_STAGE:
             unsetPublicationStage();
             return;
-        case NsdPackage.DEPENDS_ON_TYPE__RELEASE:
-            unsetRelease();
-            return;
         case NsdPackage.DEPENDS_ON_TYPE__REVISION:
             unsetRevision();
             return;
-        case NsdPackage.DEPENDS_ON_TYPE__VERSION:
-            unsetVersion();
-            return;
         }
         super.eUnset( featureID );
     }
@@ -516,12 +339,8 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
             return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals( id );
         case NsdPackage.DEPENDS_ON_TYPE__PUBLICATION_STAGE:
             return isSetPublicationStage();
-        case NsdPackage.DEPENDS_ON_TYPE__RELEASE:
-            return isSetRelease();
         case NsdPackage.DEPENDS_ON_TYPE__REVISION:
             return isSetRevision();
-        case NsdPackage.DEPENDS_ON_TYPE__VERSION:
-            return isSetVersion();
         }
         return super.eIsSet( featureID );
     }
@@ -543,21 +362,11 @@ public class DependsOnTypeImpl extends MinimalEObjectImpl.Container implements D
             result.append( publicationStage );
         else
             result.append( "<unset>" );
-        result.append( ", release: " );
-        if( releaseESet )
-            result.append( release );
-        else
-            result.append( "<unset>" );
         result.append( ", revision: " );
         if( revisionESet )
             result.append( revision );
         else
             result.append( "<unset>" );
-        result.append( ", version: " );
-        if( versionESet )
-            result.append( version );
-        else
-            result.append( "<unset>" );
         result.append( ')' );
         return result.toString();
     }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDocImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocImpl.java
similarity index 84%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDocImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocImpl.java
index a4363bfb048b7d61c085b8f4abbef6153cdd1fa7..4604c9dbf0a4dbecfe1bb089ff619866446658b1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDocImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocImpl.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -37,21 +37,21 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TDoc</b></em>'.
+ * An implementation of the model object '<em><b>Doc</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocImpl#getAny <em>Any</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocImpl#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocImpl#getMixed <em>Mixed</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocImpl#getGroup <em>Group</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocImpl#getAny <em>Any</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocImpl#getId <em>Id</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
+public class DocImpl extends MinimalEObjectImpl.Container implements Doc {
     /**
      * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
      * <!-- begin-user-doc -->
@@ -87,7 +87,7 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDocImpl() {
+    protected DocImpl() {
         super();
     }
 
@@ -98,7 +98,7 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TDOC;
+        return NsdPackage.Literals.DOC;
     }
 
     /**
@@ -109,7 +109,7 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
     @Override
     public FeatureMap getMixed() {
         if( mixed == null ) {
-            mixed = new BasicFeatureMap( this, NsdPackage.TDOC__MIXED );
+            mixed = new BasicFeatureMap( this, NsdPackage.DOC__MIXED );
         }
         return mixed;
     }
@@ -121,7 +121,7 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
      */
     @Override
     public FeatureMap getGroup() {
-        return ( FeatureMap ) getMixed().< FeatureMap.Entry > list( NsdPackage.Literals.TDOC__GROUP );
+        return ( FeatureMap ) getMixed().< FeatureMap.Entry > list( NsdPackage.Literals.DOC__GROUP );
     }
 
     /**
@@ -131,7 +131,7 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
      */
     @Override
     public FeatureMap getAny() {
-        return ( FeatureMap ) getGroup().< FeatureMap.Entry > list( NsdPackage.Literals.TDOC__ANY );
+        return ( FeatureMap ) getGroup().< FeatureMap.Entry > list( NsdPackage.Literals.DOC__ANY );
     }
 
     /**
@@ -154,7 +154,7 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
         String oldId = id;
         id = newId;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TDOC__ID, oldId, id ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DOC__ID, oldId, id ) );
     }
 
     /**
@@ -165,11 +165,11 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TDOC__MIXED:
+        case NsdPackage.DOC__MIXED:
             return ( ( InternalEList< ? > ) getMixed() ).basicRemove( otherEnd, msgs );
-        case NsdPackage.TDOC__GROUP:
+        case NsdPackage.DOC__GROUP:
             return ( ( InternalEList< ? > ) getGroup() ).basicRemove( otherEnd, msgs );
-        case NsdPackage.TDOC__ANY:
+        case NsdPackage.DOC__ANY:
             return ( ( InternalEList< ? > ) getAny() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -183,16 +183,16 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TDOC__MIXED:
+        case NsdPackage.DOC__MIXED:
             if( coreType ) return getMixed();
             return ( ( FeatureMap.Internal ) getMixed() ).getWrapper();
-        case NsdPackage.TDOC__GROUP:
+        case NsdPackage.DOC__GROUP:
             if( coreType ) return getGroup();
             return ( ( FeatureMap.Internal ) getGroup() ).getWrapper();
-        case NsdPackage.TDOC__ANY:
+        case NsdPackage.DOC__ANY:
             if( coreType ) return getAny();
             return ( ( FeatureMap.Internal ) getAny() ).getWrapper();
-        case NsdPackage.TDOC__ID:
+        case NsdPackage.DOC__ID:
             return getId();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -206,16 +206,16 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TDOC__MIXED:
+        case NsdPackage.DOC__MIXED:
             ( ( FeatureMap.Internal ) getMixed() ).set( newValue );
             return;
-        case NsdPackage.TDOC__GROUP:
+        case NsdPackage.DOC__GROUP:
             ( ( FeatureMap.Internal ) getGroup() ).set( newValue );
             return;
-        case NsdPackage.TDOC__ANY:
+        case NsdPackage.DOC__ANY:
             ( ( FeatureMap.Internal ) getAny() ).set( newValue );
             return;
-        case NsdPackage.TDOC__ID:
+        case NsdPackage.DOC__ID:
             setId( ( String ) newValue );
             return;
         }
@@ -230,16 +230,16 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDOC__MIXED:
+        case NsdPackage.DOC__MIXED:
             getMixed().clear();
             return;
-        case NsdPackage.TDOC__GROUP:
+        case NsdPackage.DOC__GROUP:
             getGroup().clear();
             return;
-        case NsdPackage.TDOC__ANY:
+        case NsdPackage.DOC__ANY:
             getAny().clear();
             return;
-        case NsdPackage.TDOC__ID:
+        case NsdPackage.DOC__ID:
             setId( ID_EDEFAULT );
             return;
         }
@@ -254,13 +254,13 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDOC__MIXED:
+        case NsdPackage.DOC__MIXED:
             return mixed != null && !mixed.isEmpty();
-        case NsdPackage.TDOC__GROUP:
+        case NsdPackage.DOC__GROUP:
             return !getGroup().isEmpty();
-        case NsdPackage.TDOC__ANY:
+        case NsdPackage.DOC__ANY:
             return !getAny().isEmpty();
-        case NsdPackage.TDOC__ID:
+        case NsdPackage.DOC__ID:
             return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals( id );
         }
         return super.eIsSet( featureID );
@@ -284,4 +284,4 @@ public class TDocImpl extends MinimalEObjectImpl.Container implements TDoc {
         return result.toString();
     }
 
-} //TDocImpl
+} //DocImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentRootImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentRootImpl.java
index 1ff516cb97e8e2a1dd1fb978d20b075b277e33b6..378f499450c0940c755a13995f4f72e017f5798b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentRootImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentRootImpl.java
@@ -19,13 +19,13 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -161,9 +161,8 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public TApplicableServiceNS getApplicableServiceNS() {
-        return ( TApplicableServiceNS ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS,
-                true );
+    public ApplicableServiceNS getApplicableServiceNS() {
+        return ( ApplicableServiceNS ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS, true );
     }
 
     /**
@@ -171,7 +170,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetApplicableServiceNS( TApplicableServiceNS newApplicableServiceNS,
+    public NotificationChain basicSetApplicableServiceNS( ApplicableServiceNS newApplicableServiceNS,
             NotificationChain msgs ) {
         return ( ( FeatureMap.Internal ) getMixed() )
                 .basicAdd( NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS, newApplicableServiceNS, msgs );
@@ -183,7 +182,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public void setApplicableServiceNS( TApplicableServiceNS newApplicableServiceNS ) {
+    public void setApplicableServiceNS( ApplicableServiceNS newApplicableServiceNS ) {
         ( ( FeatureMap.Internal ) getMixed() ).set( NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS,
                 newApplicableServiceNS );
     }
@@ -194,8 +193,8 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public TCopyrightNotice getCopyright() {
-        return ( TCopyrightNotice ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__COPYRIGHT, true );
+    public CopyrightNotice getCopyright() {
+        return ( CopyrightNotice ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__COPYRIGHT, true );
     }
 
     /**
@@ -203,7 +202,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetCopyright( TCopyrightNotice newCopyright, NotificationChain msgs ) {
+    public NotificationChain basicSetCopyright( CopyrightNotice newCopyright, NotificationChain msgs ) {
         return ( ( FeatureMap.Internal ) getMixed() ).basicAdd( NsdPackage.Literals.DOCUMENT_ROOT__COPYRIGHT,
                 newCopyright, msgs );
     }
@@ -214,7 +213,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public void setCopyright( TCopyrightNotice newCopyright ) {
+    public void setCopyright( CopyrightNotice newCopyright ) {
         ( ( FeatureMap.Internal ) getMixed() ).set( NsdPackage.Literals.DOCUMENT_ROOT__COPYRIGHT, newCopyright );
     }
 
@@ -224,8 +223,8 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public TNS getNS() {
-        return ( TNS ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__NS, true );
+    public NS getNS() {
+        return ( NS ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__NS, true );
     }
 
     /**
@@ -233,7 +232,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetNS( TNS newNS, NotificationChain msgs ) {
+    public NotificationChain basicSetNS( NS newNS, NotificationChain msgs ) {
         return ( ( FeatureMap.Internal ) getMixed() ).basicAdd( NsdPackage.Literals.DOCUMENT_ROOT__NS, newNS, msgs );
     }
 
@@ -243,7 +242,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public void setNS( TNS newNS ) {
+    public void setNS( NS newNS ) {
         ( ( FeatureMap.Internal ) getMixed() ).set( NsdPackage.Literals.DOCUMENT_ROOT__NS, newNS );
     }
 
@@ -253,8 +252,8 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public TNSDoc getNSDoc() {
-        return ( TNSDoc ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, true );
+    public NSDoc getNSDoc() {
+        return ( NSDoc ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, true );
     }
 
     /**
@@ -262,7 +261,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetNSDoc( TNSDoc newNSDoc, NotificationChain msgs ) {
+    public NotificationChain basicSetNSDoc( NSDoc newNSDoc, NotificationChain msgs ) {
         return ( ( FeatureMap.Internal ) getMixed() ).basicAdd( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, newNSDoc,
                 msgs );
     }
@@ -273,7 +272,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public void setNSDoc( TNSDoc newNSDoc ) {
+    public void setNSDoc( NSDoc newNSDoc ) {
         ( ( FeatureMap.Internal ) getMixed() ).set( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, newNSDoc );
     }
 
@@ -283,8 +282,8 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public TServiceNS getServiceNS() {
-        return ( TServiceNS ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS, true );
+    public ServiceNS getServiceNS() {
+        return ( ServiceNS ) getMixed().get( NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS, true );
     }
 
     /**
@@ -292,7 +291,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetServiceNS( TServiceNS newServiceNS, NotificationChain msgs ) {
+    public NotificationChain basicSetServiceNS( ServiceNS newServiceNS, NotificationChain msgs ) {
         return ( ( FeatureMap.Internal ) getMixed() ).basicAdd( NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS,
                 newServiceNS, msgs );
     }
@@ -303,7 +302,7 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
      * @generated
      */
     @Override
-    public void setServiceNS( TServiceNS newServiceNS ) {
+    public void setServiceNS( ServiceNS newServiceNS ) {
         ( ( FeatureMap.Internal ) getMixed() ).set( NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS, newServiceNS );
     }
 
@@ -388,19 +387,19 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
             ( ( EStructuralFeature.Setting ) getXSISchemaLocation() ).set( newValue );
             return;
         case NsdPackage.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS:
-            setApplicableServiceNS( ( TApplicableServiceNS ) newValue );
+            setApplicableServiceNS( ( ApplicableServiceNS ) newValue );
             return;
         case NsdPackage.DOCUMENT_ROOT__COPYRIGHT:
-            setCopyright( ( TCopyrightNotice ) newValue );
+            setCopyright( ( CopyrightNotice ) newValue );
             return;
         case NsdPackage.DOCUMENT_ROOT__NS:
-            setNS( ( TNS ) newValue );
+            setNS( ( NS ) newValue );
             return;
         case NsdPackage.DOCUMENT_ROOT__NS_DOC:
-            setNSDoc( ( TNSDoc ) newValue );
+            setNSDoc( ( NSDoc ) newValue );
             return;
         case NsdPackage.DOCUMENT_ROOT__SERVICE_NS:
-            setServiceNS( ( TServiceNS ) newValue );
+            setServiceNS( ( ServiceNS ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -424,19 +423,19 @@ public class DocumentRootImpl extends MinimalEObjectImpl.Container implements Do
             getXSISchemaLocation().clear();
             return;
         case NsdPackage.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS:
-            setApplicableServiceNS( ( TApplicableServiceNS ) null );
+            setApplicableServiceNS( ( ApplicableServiceNS ) null );
             return;
         case NsdPackage.DOCUMENT_ROOT__COPYRIGHT:
-            setCopyright( ( TCopyrightNotice ) null );
+            setCopyright( ( CopyrightNotice ) null );
             return;
         case NsdPackage.DOCUMENT_ROOT__NS:
-            setNS( ( TNS ) null );
+            setNS( ( NS ) null );
             return;
         case NsdPackage.DOCUMENT_ROOT__NS_DOC:
-            setNSDoc( ( TNSDoc ) null );
+            setNSDoc( ( NSDoc ) null );
             return;
         case NsdPackage.DOCUMENT_ROOT__SERVICE_NS:
-            setServiceNS( ( TServiceNS ) null );
+            setServiceNS( ( ServiceNS ) null );
             return;
         }
         super.eUnset( featureID );
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDocumentedClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java
similarity index 83%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDocumentedClassImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java
index 813e95d90155fe1f345e84b5af4cbff14643ca8e..22f376868a2416c12ee902ac15db368fb7c6f3c0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TDocumentedClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -31,20 +31,20 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TDocumented Class</b></em>'.
+ * An implementation of the model object '<em><b>Documented Class</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocumentedClassImpl#isDeprecated <em>Deprecated</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocumentedClassImpl#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TDocumentedClassImpl#isInformative <em>Informative</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocumentedClassImpl#isDeprecated <em>Deprecated</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocumentedClassImpl#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.DocumentedClassImpl#isInformative <em>Informative</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implements TDocumentedClass {
+public class DocumentedClassImpl extends MinimalEObjectImpl.Container implements DocumentedClass {
     /**
      * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -128,7 +128,7 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TDocumentedClassImpl() {
+    protected DocumentedClassImpl() {
         super();
     }
 
@@ -139,7 +139,7 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TDOCUMENTED_CLASS;
+        return NsdPackage.Literals.DOCUMENTED_CLASS;
     }
 
     /**
@@ -164,7 +164,7 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
         boolean oldDeprecatedESet = deprecatedESet;
         deprecatedESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDOCUMENTED_CLASS__DEPRECATED, oldDeprecated, deprecated, !oldDeprecatedESet ) );
+                NsdPackage.DOCUMENTED_CLASS__DEPRECATED, oldDeprecated, deprecated, !oldDeprecatedESet ) );
     }
 
     /**
@@ -179,7 +179,7 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
         deprecated = DEPRECATED_EDEFAULT;
         deprecatedESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDOCUMENTED_CLASS__DEPRECATED, oldDeprecated, DEPRECATED_EDEFAULT, oldDeprecatedESet ) );
+                NsdPackage.DOCUMENTED_CLASS__DEPRECATED, oldDeprecated, DEPRECATED_EDEFAULT, oldDeprecatedESet ) );
     }
 
     /**
@@ -212,7 +212,7 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
         String oldDescID = descID;
         descID = newDescID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDOCUMENTED_CLASS__DESC_ID, oldDescID, descID ) );
+                NsdPackage.DOCUMENTED_CLASS__DESC_ID, oldDescID, descID ) );
     }
 
     /**
@@ -237,7 +237,7 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
         boolean oldInformativeESet = informativeESet;
         informativeESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TDOCUMENTED_CLASS__INFORMATIVE, oldInformative, informative, !oldInformativeESet ) );
+                NsdPackage.DOCUMENTED_CLASS__INFORMATIVE, oldInformative, informative, !oldInformativeESet ) );
     }
 
     /**
@@ -252,7 +252,7 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
         informative = INFORMATIVE_EDEFAULT;
         informativeESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TDOCUMENTED_CLASS__INFORMATIVE, oldInformative, INFORMATIVE_EDEFAULT, oldInformativeESet ) );
+                NsdPackage.DOCUMENTED_CLASS__INFORMATIVE, oldInformative, INFORMATIVE_EDEFAULT, oldInformativeESet ) );
     }
 
     /**
@@ -273,11 +273,11 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TDOCUMENTED_CLASS__DEPRECATED:
+        case NsdPackage.DOCUMENTED_CLASS__DEPRECATED:
             return isDeprecated();
-        case NsdPackage.TDOCUMENTED_CLASS__DESC_ID:
+        case NsdPackage.DOCUMENTED_CLASS__DESC_ID:
             return getDescID();
-        case NsdPackage.TDOCUMENTED_CLASS__INFORMATIVE:
+        case NsdPackage.DOCUMENTED_CLASS__INFORMATIVE:
             return isInformative();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -291,13 +291,13 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TDOCUMENTED_CLASS__DEPRECATED:
+        case NsdPackage.DOCUMENTED_CLASS__DEPRECATED:
             setDeprecated( ( Boolean ) newValue );
             return;
-        case NsdPackage.TDOCUMENTED_CLASS__DESC_ID:
+        case NsdPackage.DOCUMENTED_CLASS__DESC_ID:
             setDescID( ( String ) newValue );
             return;
-        case NsdPackage.TDOCUMENTED_CLASS__INFORMATIVE:
+        case NsdPackage.DOCUMENTED_CLASS__INFORMATIVE:
             setInformative( ( Boolean ) newValue );
             return;
         }
@@ -312,13 +312,13 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDOCUMENTED_CLASS__DEPRECATED:
+        case NsdPackage.DOCUMENTED_CLASS__DEPRECATED:
             unsetDeprecated();
             return;
-        case NsdPackage.TDOCUMENTED_CLASS__DESC_ID:
+        case NsdPackage.DOCUMENTED_CLASS__DESC_ID:
             setDescID( DESC_ID_EDEFAULT );
             return;
-        case NsdPackage.TDOCUMENTED_CLASS__INFORMATIVE:
+        case NsdPackage.DOCUMENTED_CLASS__INFORMATIVE:
             unsetInformative();
             return;
         }
@@ -333,11 +333,11 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TDOCUMENTED_CLASS__DEPRECATED:
+        case NsdPackage.DOCUMENTED_CLASS__DEPRECATED:
             return isSetDeprecated();
-        case NsdPackage.TDOCUMENTED_CLASS__DESC_ID:
+        case NsdPackage.DOCUMENTED_CLASS__DESC_ID:
             return DESC_ID_EDEFAULT == null ? descID != null : !DESC_ID_EDEFAULT.equals( descID );
-        case NsdPackage.TDOCUMENTED_CLASS__INFORMATIVE:
+        case NsdPackage.DOCUMENTED_CLASS__INFORMATIVE:
             return isSetInformative();
         }
         return super.eIsSet( featureID );
@@ -369,4 +369,4 @@ public class TDocumentedClassImpl extends MinimalEObjectImpl.Container implement
         return result.toString();
     }
 
-} //TDocumentedClassImpl
+} //DocumentedClassImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TEnumerationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TEnumerationImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java
index db5bff0a30ae14c9fcbbef820898f8a0b8ef7455..18160b92e728c24bab0fec3577809804c87cb140 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TEnumerationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral;
 
 import java.util.Collection;
 
@@ -40,20 +40,20 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TEnumeration</b></em>'.
+ * An implementation of the model object '<em><b>Enumeration</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationImpl#getLiteral <em>Literal</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationImpl#getInheritedFrom <em>Inherited From</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationImpl#getLiteral <em>Literal</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationImpl#getInheritedFrom <em>Inherited From</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationImpl#getName <em>Name</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
+public class EnumerationImpl extends TitledClassImpl implements Enumeration {
     /**
      * The cached value of the '{@link #getLiteral() <em>Literal</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -62,7 +62,7 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
      * @generated
      * @ordered
      */
-    protected EList< TLiteral > literal;
+    protected EList< Literal > literal;
 
     /**
      * The default value of the '{@link #getInheritedFrom() <em>Inherited From</em>}' attribute.
@@ -109,7 +109,7 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TEnumerationImpl() {
+    protected EnumerationImpl() {
         super();
     }
 
@@ -120,7 +120,7 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TENUMERATION;
+        return NsdPackage.Literals.ENUMERATION;
     }
 
     /**
@@ -129,9 +129,9 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
      * @generated
      */
     @Override
-    public EList< TLiteral > getLiteral() {
+    public EList< Literal > getLiteral() {
         if( literal == null ) {
-            literal = new EObjectContainmentEList< TLiteral >( TLiteral.class, this, NsdPackage.TENUMERATION__LITERAL );
+            literal = new EObjectContainmentEList< Literal >( Literal.class, this, NsdPackage.ENUMERATION__LITERAL );
         }
         return literal;
     }
@@ -156,7 +156,7 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
         String oldInheritedFrom = inheritedFrom;
         inheritedFrom = newInheritedFrom;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TENUMERATION__INHERITED_FROM, oldInheritedFrom, inheritedFrom ) );
+                NsdPackage.ENUMERATION__INHERITED_FROM, oldInheritedFrom, inheritedFrom ) );
     }
 
     /**
@@ -179,7 +179,7 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
         String oldName = name;
         name = newName;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TENUMERATION__NAME, oldName, name ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ENUMERATION__NAME, oldName, name ) );
     }
 
     /**
@@ -190,7 +190,7 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATION__LITERAL:
+        case NsdPackage.ENUMERATION__LITERAL:
             return ( ( InternalEList< ? > ) getLiteral() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -204,11 +204,11 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATION__LITERAL:
+        case NsdPackage.ENUMERATION__LITERAL:
             return getLiteral();
-        case NsdPackage.TENUMERATION__INHERITED_FROM:
+        case NsdPackage.ENUMERATION__INHERITED_FROM:
             return getInheritedFrom();
-        case NsdPackage.TENUMERATION__NAME:
+        case NsdPackage.ENUMERATION__NAME:
             return getName();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -223,14 +223,14 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATION__LITERAL:
+        case NsdPackage.ENUMERATION__LITERAL:
             getLiteral().clear();
-            getLiteral().addAll( ( Collection< ? extends TLiteral > ) newValue );
+            getLiteral().addAll( ( Collection< ? extends Literal > ) newValue );
             return;
-        case NsdPackage.TENUMERATION__INHERITED_FROM:
+        case NsdPackage.ENUMERATION__INHERITED_FROM:
             setInheritedFrom( ( String ) newValue );
             return;
-        case NsdPackage.TENUMERATION__NAME:
+        case NsdPackage.ENUMERATION__NAME:
             setName( ( String ) newValue );
             return;
         }
@@ -245,13 +245,13 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATION__LITERAL:
+        case NsdPackage.ENUMERATION__LITERAL:
             getLiteral().clear();
             return;
-        case NsdPackage.TENUMERATION__INHERITED_FROM:
+        case NsdPackage.ENUMERATION__INHERITED_FROM:
             setInheritedFrom( INHERITED_FROM_EDEFAULT );
             return;
-        case NsdPackage.TENUMERATION__NAME:
+        case NsdPackage.ENUMERATION__NAME:
             setName( NAME_EDEFAULT );
             return;
         }
@@ -266,12 +266,12 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATION__LITERAL:
+        case NsdPackage.ENUMERATION__LITERAL:
             return literal != null && !literal.isEmpty();
-        case NsdPackage.TENUMERATION__INHERITED_FROM:
+        case NsdPackage.ENUMERATION__INHERITED_FROM:
             return INHERITED_FROM_EDEFAULT == null ? inheritedFrom != null
                     : !INHERITED_FROM_EDEFAULT.equals( inheritedFrom );
-        case NsdPackage.TENUMERATION__NAME:
+        case NsdPackage.ENUMERATION__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
         }
         return super.eIsSet( featureID );
@@ -295,4 +295,4 @@ public class TEnumerationImpl extends TTitledClassImpl implements TEnumeration {
         return result.toString();
     }
 
-} //TEnumerationImpl
+} //EnumerationImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TEnumerationsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationsImpl.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TEnumerationsImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationsImpl.java
index 57921ab8710d88443b544d1415a3e07dce546092..468d274a10cb464c7a3a995425215316255d8a5e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TEnumerationsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationsImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations;
 
 import java.util.Collection;
 
@@ -39,18 +39,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TEnumerations</b></em>'.
+ * An implementation of the model object '<em><b>Enumerations</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TEnumerationsImpl#getEnumeration <em>Enumeration</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.EnumerationsImpl#getEnumeration <em>Enumeration</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TEnumerationsImpl extends MinimalEObjectImpl.Container implements TEnumerations {
+public class EnumerationsImpl extends MinimalEObjectImpl.Container implements Enumerations {
     /**
      * The cached value of the '{@link #getEnumeration() <em>Enumeration</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -59,14 +59,14 @@ public class TEnumerationsImpl extends MinimalEObjectImpl.Container implements T
      * @generated
      * @ordered
      */
-    protected EList< TEnumeration > enumeration;
+    protected EList< Enumeration > enumeration;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TEnumerationsImpl() {
+    protected EnumerationsImpl() {
         super();
     }
 
@@ -77,7 +77,7 @@ public class TEnumerationsImpl extends MinimalEObjectImpl.Container implements T
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TENUMERATIONS;
+        return NsdPackage.Literals.ENUMERATIONS;
     }
 
     /**
@@ -86,10 +86,10 @@ public class TEnumerationsImpl extends MinimalEObjectImpl.Container implements T
      * @generated
      */
     @Override
-    public EList< TEnumeration > getEnumeration() {
+    public EList< Enumeration > getEnumeration() {
         if( enumeration == null ) {
-            enumeration = new EObjectContainmentEList< TEnumeration >( TEnumeration.class, this,
-                    NsdPackage.TENUMERATIONS__ENUMERATION );
+            enumeration = new EObjectContainmentEList< Enumeration >( Enumeration.class, this,
+                    NsdPackage.ENUMERATIONS__ENUMERATION );
         }
         return enumeration;
     }
@@ -102,7 +102,7 @@ public class TEnumerationsImpl extends MinimalEObjectImpl.Container implements T
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATIONS__ENUMERATION:
+        case NsdPackage.ENUMERATIONS__ENUMERATION:
             return ( ( InternalEList< ? > ) getEnumeration() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -116,7 +116,7 @@ public class TEnumerationsImpl extends MinimalEObjectImpl.Container implements T
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATIONS__ENUMERATION:
+        case NsdPackage.ENUMERATIONS__ENUMERATION:
             return getEnumeration();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -131,9 +131,9 @@ public class TEnumerationsImpl extends MinimalEObjectImpl.Container implements T
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATIONS__ENUMERATION:
+        case NsdPackage.ENUMERATIONS__ENUMERATION:
             getEnumeration().clear();
-            getEnumeration().addAll( ( Collection< ? extends TEnumeration > ) newValue );
+            getEnumeration().addAll( ( Collection< ? extends Enumeration > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -147,7 +147,7 @@ public class TEnumerationsImpl extends MinimalEObjectImpl.Container implements T
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATIONS__ENUMERATION:
+        case NsdPackage.ENUMERATIONS__ENUMERATION:
             getEnumeration().clear();
             return;
         }
@@ -162,10 +162,10 @@ public class TEnumerationsImpl extends MinimalEObjectImpl.Container implements T
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TENUMERATIONS__ENUMERATION:
+        case NsdPackage.ENUMERATIONS__ENUMERATION:
             return enumeration != null && !enumeration.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TEnumerationsImpl
+} //EnumerationsImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TFunctionalConstraintImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java
similarity index 74%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TFunctionalConstraintImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java
index d6a1dac8107e096443b7800adb04ead45d1d2e51..0aeb4ebc1fdd5604244f52bae55e4266b94cdba0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TFunctionalConstraintImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -34,21 +34,21 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TFunctional Constraint</b></em>'.
+ * An implementation of the model object '<em><b>Functional Constraint</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintImpl#getApplicableServices <em>Applicable Services</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintImpl#getAbbreviation <em>Abbreviation</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintImpl#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintImpl#getTitleID <em>Title ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintImpl#getApplicableServices <em>Applicable Services</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintImpl#getAbbreviation <em>Abbreviation</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintImpl#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintImpl#getTitleID <em>Title ID</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container implements TFunctionalConstraint {
+public class FunctionalConstraintImpl extends MinimalEObjectImpl.Container implements FunctionalConstraint {
     /**
      * The cached value of the '{@link #getApplicableServices() <em>Applicable Services</em>}' containment reference.
      * <!-- begin-user-doc -->
@@ -57,7 +57,7 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
      * @generated
      * @ordered
      */
-    protected TApplicableServices applicableServices;
+    protected ApplicableServices applicableServices;
 
     /**
      * The default value of the '{@link #getAbbreviation() <em>Abbreviation</em>}' attribute.
@@ -124,7 +124,7 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TFunctionalConstraintImpl() {
+    protected FunctionalConstraintImpl() {
         super();
     }
 
@@ -135,7 +135,7 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TFUNCTIONAL_CONSTRAINT;
+        return NsdPackage.Literals.FUNCTIONAL_CONSTRAINT;
     }
 
     /**
@@ -144,7 +144,7 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
      * @generated
      */
     @Override
-    public TApplicableServices getApplicableServices() {
+    public ApplicableServices getApplicableServices() {
         return applicableServices;
     }
 
@@ -153,13 +153,13 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetApplicableServices( TApplicableServices newApplicableServices,
+    public NotificationChain basicSetApplicableServices( ApplicableServices newApplicableServices,
             NotificationChain msgs ) {
-        TApplicableServices oldApplicableServices = applicableServices;
+        ApplicableServices oldApplicableServices = applicableServices;
         applicableServices = newApplicableServices;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, oldApplicableServices,
+                    NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, oldApplicableServices,
                     newApplicableServices );
             if( msgs == null )
                 msgs = notification;
@@ -175,19 +175,18 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
      * @generated
      */
     @Override
-    public void setApplicableServices( TApplicableServices newApplicableServices ) {
+    public void setApplicableServices( ApplicableServices newApplicableServices ) {
         if( newApplicableServices != applicableServices ) {
             NotificationChain msgs = null;
             if( applicableServices != null ) msgs = ( ( InternalEObject ) applicableServices ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, null, msgs );
             if( newApplicableServices != null ) msgs = ( ( InternalEObject ) newApplicableServices ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, null, msgs );
             msgs = basicSetApplicableServices( newApplicableServices, msgs );
             if( msgs != null ) msgs.dispatch();
         }
-        else if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES,
-                        newApplicableServices, newApplicableServices ) );
+        else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
+                NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, newApplicableServices, newApplicableServices ) );
     }
 
     /**
@@ -210,7 +209,7 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
         String oldAbbreviation = abbreviation;
         abbreviation = newAbbreviation;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TFUNCTIONAL_CONSTRAINT__ABBREVIATION, oldAbbreviation, abbreviation ) );
+                NsdPackage.FUNCTIONAL_CONSTRAINT__ABBREVIATION, oldAbbreviation, abbreviation ) );
     }
 
     /**
@@ -233,7 +232,7 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
         String oldDescID = descID;
         descID = newDescID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TFUNCTIONAL_CONSTRAINT__DESC_ID, oldDescID, descID ) );
+                NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID, oldDescID, descID ) );
     }
 
     /**
@@ -256,7 +255,7 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
         String oldTitleID = titleID;
         titleID = newTitleID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TFUNCTIONAL_CONSTRAINT__TITLE_ID, oldTitleID, titleID ) );
+                NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID, oldTitleID, titleID ) );
     }
 
     /**
@@ -267,7 +266,7 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
             return basicSetApplicableServices( null, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -281,13 +280,13 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
             return getApplicableServices();
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__ABBREVIATION:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__ABBREVIATION:
             return getAbbreviation();
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__DESC_ID:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID:
             return getDescID();
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__TITLE_ID:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID:
             return getTitleID();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -301,16 +300,16 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
-            setApplicableServices( ( TApplicableServices ) newValue );
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
+            setApplicableServices( ( ApplicableServices ) newValue );
             return;
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__ABBREVIATION:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__ABBREVIATION:
             setAbbreviation( ( String ) newValue );
             return;
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__DESC_ID:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID:
             setDescID( ( String ) newValue );
             return;
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__TITLE_ID:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID:
             setTitleID( ( String ) newValue );
             return;
         }
@@ -325,16 +324,16 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
-            setApplicableServices( ( TApplicableServices ) null );
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
+            setApplicableServices( ( ApplicableServices ) null );
             return;
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__ABBREVIATION:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__ABBREVIATION:
             setAbbreviation( ABBREVIATION_EDEFAULT );
             return;
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__DESC_ID:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID:
             setDescID( DESC_ID_EDEFAULT );
             return;
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__TITLE_ID:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID:
             setTitleID( TITLE_ID_EDEFAULT );
             return;
         }
@@ -349,13 +348,13 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES:
             return applicableServices != null;
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__ABBREVIATION:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__ABBREVIATION:
             return ABBREVIATION_EDEFAULT == null ? abbreviation != null : !ABBREVIATION_EDEFAULT.equals( abbreviation );
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__DESC_ID:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID:
             return DESC_ID_EDEFAULT == null ? descID != null : !DESC_ID_EDEFAULT.equals( descID );
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT__TITLE_ID:
+        case NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID:
             return TITLE_ID_EDEFAULT == null ? titleID != null : !TITLE_ID_EDEFAULT.equals( titleID );
         }
         return super.eIsSet( featureID );
@@ -381,4 +380,4 @@ public class TFunctionalConstraintImpl extends MinimalEObjectImpl.Container impl
         return result.toString();
     }
 
-} //TFunctionalConstraintImpl
+} //FunctionalConstraintImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TFunctionalConstraintsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintsImpl.java
similarity index 75%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TFunctionalConstraintsImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintsImpl.java
index beaad00ab855f83c85186e96ec2b46178b7ebc07..661af221223e53fdfd986b0f57b632102be8e589 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TFunctionalConstraintsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintsImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints;
 
 import java.util.Collection;
 
@@ -39,18 +39,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TFunctional Constraints</b></em>'.
+ * An implementation of the model object '<em><b>Functional Constraints</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TFunctionalConstraintsImpl#getFunctionalConstraint <em>Functional Constraint</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.FunctionalConstraintsImpl#getFunctionalConstraint <em>Functional Constraint</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TFunctionalConstraintsImpl extends MinimalEObjectImpl.Container implements TFunctionalConstraints {
+public class FunctionalConstraintsImpl extends MinimalEObjectImpl.Container implements FunctionalConstraints {
     /**
      * The cached value of the '{@link #getFunctionalConstraint() <em>Functional Constraint</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -59,14 +59,14 @@ public class TFunctionalConstraintsImpl extends MinimalEObjectImpl.Container imp
      * @generated
      * @ordered
      */
-    protected EList< TFunctionalConstraint > functionalConstraint;
+    protected EList< FunctionalConstraint > functionalConstraint;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TFunctionalConstraintsImpl() {
+    protected FunctionalConstraintsImpl() {
         super();
     }
 
@@ -77,7 +77,7 @@ public class TFunctionalConstraintsImpl extends MinimalEObjectImpl.Container imp
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TFUNCTIONAL_CONSTRAINTS;
+        return NsdPackage.Literals.FUNCTIONAL_CONSTRAINTS;
     }
 
     /**
@@ -86,10 +86,10 @@ public class TFunctionalConstraintsImpl extends MinimalEObjectImpl.Container imp
      * @generated
      */
     @Override
-    public EList< TFunctionalConstraint > getFunctionalConstraint() {
+    public EList< FunctionalConstraint > getFunctionalConstraint() {
         if( functionalConstraint == null ) {
-            functionalConstraint = new EObjectContainmentEList< TFunctionalConstraint >( TFunctionalConstraint.class,
-                    this, NsdPackage.TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT );
+            functionalConstraint = new EObjectContainmentEList< FunctionalConstraint >( FunctionalConstraint.class,
+                    this, NsdPackage.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT );
         }
         return functionalConstraint;
     }
@@ -102,7 +102,7 @@ public class TFunctionalConstraintsImpl extends MinimalEObjectImpl.Container imp
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
+        case NsdPackage.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
             return ( ( InternalEList< ? > ) getFunctionalConstraint() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -116,7 +116,7 @@ public class TFunctionalConstraintsImpl extends MinimalEObjectImpl.Container imp
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
+        case NsdPackage.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
             return getFunctionalConstraint();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -131,9 +131,9 @@ public class TFunctionalConstraintsImpl extends MinimalEObjectImpl.Container imp
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
+        case NsdPackage.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
             getFunctionalConstraint().clear();
-            getFunctionalConstraint().addAll( ( Collection< ? extends TFunctionalConstraint > ) newValue );
+            getFunctionalConstraint().addAll( ( Collection< ? extends FunctionalConstraint > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -147,7 +147,7 @@ public class TFunctionalConstraintsImpl extends MinimalEObjectImpl.Container imp
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
+        case NsdPackage.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
             getFunctionalConstraint().clear();
             return;
         }
@@ -162,10 +162,10 @@ public class TFunctionalConstraintsImpl extends MinimalEObjectImpl.Container imp
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
+        case NsdPackage.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT:
             return functionalConstraint != null && !functionalConstraint.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TFunctionalConstraintsImpl
+} //FunctionalConstraintsImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java
similarity index 85%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLNClassImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java
index fa863d968a50c944c6e35b73f666d6ec4fb51225..21a4baa9796e762b945853a63514d270dab05831 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLNClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -30,20 +30,20 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TLN Class</b></em>'.
+ * An implementation of the model object '<em><b>LN Class</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassImpl#isCanHaveLOG <em>Can Have LOG</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassImpl#isIsExtension <em>Is Extension</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassImpl#isCanHaveLOG <em>Can Have LOG</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassImpl#isIsExtension <em>Is Extension</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassImpl#getName <em>Name</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
+public class LNClassImpl extends AnyLNClassImpl implements LNClass {
     /**
      * The default value of the '{@link #isCanHaveLOG() <em>Can Have LOG</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -127,7 +127,7 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TLNClassImpl() {
+    protected LNClassImpl() {
         super();
     }
 
@@ -138,7 +138,7 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TLN_CLASS;
+        return NsdPackage.Literals.LN_CLASS;
     }
 
     /**
@@ -163,7 +163,7 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
         boolean oldCanHaveLOGESet = canHaveLOGESet;
         canHaveLOGESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TLN_CLASS__CAN_HAVE_LOG, oldCanHaveLOG, canHaveLOG, !oldCanHaveLOGESet ) );
+                NsdPackage.LN_CLASS__CAN_HAVE_LOG, oldCanHaveLOG, canHaveLOG, !oldCanHaveLOGESet ) );
     }
 
     /**
@@ -178,7 +178,7 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
         canHaveLOG = CAN_HAVE_LOG_EDEFAULT;
         canHaveLOGESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TLN_CLASS__CAN_HAVE_LOG, oldCanHaveLOG, CAN_HAVE_LOG_EDEFAULT, oldCanHaveLOGESet ) );
+                NsdPackage.LN_CLASS__CAN_HAVE_LOG, oldCanHaveLOG, CAN_HAVE_LOG_EDEFAULT, oldCanHaveLOGESet ) );
     }
 
     /**
@@ -213,7 +213,7 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
         boolean oldIsExtensionESet = isExtensionESet;
         isExtensionESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TLN_CLASS__IS_EXTENSION, oldIsExtension, isExtension, !oldIsExtensionESet ) );
+                NsdPackage.LN_CLASS__IS_EXTENSION, oldIsExtension, isExtension, !oldIsExtensionESet ) );
     }
 
     /**
@@ -228,7 +228,7 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
         isExtension = IS_EXTENSION_EDEFAULT;
         isExtensionESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TLN_CLASS__IS_EXTENSION, oldIsExtension, IS_EXTENSION_EDEFAULT, oldIsExtensionESet ) );
+                NsdPackage.LN_CLASS__IS_EXTENSION, oldIsExtension, IS_EXTENSION_EDEFAULT, oldIsExtensionESet ) );
     }
 
     /**
@@ -261,7 +261,7 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
         String oldName = name;
         name = newName;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TLN_CLASS__NAME, oldName, name ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LN_CLASS__NAME, oldName, name ) );
     }
 
     /**
@@ -272,11 +272,11 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TLN_CLASS__CAN_HAVE_LOG:
+        case NsdPackage.LN_CLASS__CAN_HAVE_LOG:
             return isCanHaveLOG();
-        case NsdPackage.TLN_CLASS__IS_EXTENSION:
+        case NsdPackage.LN_CLASS__IS_EXTENSION:
             return isIsExtension();
-        case NsdPackage.TLN_CLASS__NAME:
+        case NsdPackage.LN_CLASS__NAME:
             return getName();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -290,13 +290,13 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TLN_CLASS__CAN_HAVE_LOG:
+        case NsdPackage.LN_CLASS__CAN_HAVE_LOG:
             setCanHaveLOG( ( Boolean ) newValue );
             return;
-        case NsdPackage.TLN_CLASS__IS_EXTENSION:
+        case NsdPackage.LN_CLASS__IS_EXTENSION:
             setIsExtension( ( Boolean ) newValue );
             return;
-        case NsdPackage.TLN_CLASS__NAME:
+        case NsdPackage.LN_CLASS__NAME:
             setName( ( String ) newValue );
             return;
         }
@@ -311,13 +311,13 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TLN_CLASS__CAN_HAVE_LOG:
+        case NsdPackage.LN_CLASS__CAN_HAVE_LOG:
             unsetCanHaveLOG();
             return;
-        case NsdPackage.TLN_CLASS__IS_EXTENSION:
+        case NsdPackage.LN_CLASS__IS_EXTENSION:
             unsetIsExtension();
             return;
-        case NsdPackage.TLN_CLASS__NAME:
+        case NsdPackage.LN_CLASS__NAME:
             setName( NAME_EDEFAULT );
             return;
         }
@@ -332,11 +332,11 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TLN_CLASS__CAN_HAVE_LOG:
+        case NsdPackage.LN_CLASS__CAN_HAVE_LOG:
             return isSetCanHaveLOG();
-        case NsdPackage.TLN_CLASS__IS_EXTENSION:
+        case NsdPackage.LN_CLASS__IS_EXTENSION:
             return isSetIsExtension();
-        case NsdPackage.TLN_CLASS__NAME:
+        case NsdPackage.LN_CLASS__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
         }
         return super.eIsSet( featureID );
@@ -368,4 +368,4 @@ public class TLNClassImpl extends TAnyLNClassImpl implements TLNClass {
         return result.toString();
     }
 
-} //TLNClassImpl
+} //LNClassImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLNClassesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassesImpl.java
similarity index 72%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLNClassesImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassesImpl.java
index 50d641913ff64c6418816364a7dad19508c776d0..fce5ff051e036e445b9b6a4a68d3d10d1999f5ee 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLNClassesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassesImpl.java
@@ -19,10 +19,10 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses;
 
 import java.util.Collection;
 
@@ -40,19 +40,19 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TLN Classes</b></em>'.
+ * An implementation of the model object '<em><b>LN Classes</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassesImpl#getAbstractLNClass <em>Abstract LN Class</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLNClassesImpl#getLNClass <em>LN Class</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassesImpl#getAbstractLNClass <em>Abstract LN Class</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LNClassesImpl#getLNClass <em>LN Class</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNClasses {
+public class LNClassesImpl extends MinimalEObjectImpl.Container implements LNClasses {
     /**
      * The cached value of the '{@link #getAbstractLNClass() <em>Abstract LN Class</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -61,7 +61,7 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
      * @generated
      * @ordered
      */
-    protected EList< TAbstractLNClass > abstractLNClass;
+    protected EList< AbstractLNClass > abstractLNClass;
 
     /**
      * The cached value of the '{@link #getLNClass() <em>LN Class</em>}' containment reference list.
@@ -71,14 +71,14 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
      * @generated
      * @ordered
      */
-    protected EList< TLNClass > lNClass;
+    protected EList< LNClass > lNClass;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TLNClassesImpl() {
+    protected LNClassesImpl() {
         super();
     }
 
@@ -89,7 +89,7 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TLN_CLASSES;
+        return NsdPackage.Literals.LN_CLASSES;
     }
 
     /**
@@ -98,10 +98,10 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
      * @generated
      */
     @Override
-    public EList< TAbstractLNClass > getAbstractLNClass() {
+    public EList< AbstractLNClass > getAbstractLNClass() {
         if( abstractLNClass == null ) {
-            abstractLNClass = new EObjectContainmentEList< TAbstractLNClass >( TAbstractLNClass.class, this,
-                    NsdPackage.TLN_CLASSES__ABSTRACT_LN_CLASS );
+            abstractLNClass = new EObjectContainmentEList< AbstractLNClass >( AbstractLNClass.class, this,
+                    NsdPackage.LN_CLASSES__ABSTRACT_LN_CLASS );
         }
         return abstractLNClass;
     }
@@ -112,9 +112,9 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
      * @generated
      */
     @Override
-    public EList< TLNClass > getLNClass() {
+    public EList< LNClass > getLNClass() {
         if( lNClass == null ) {
-            lNClass = new EObjectContainmentEList< TLNClass >( TLNClass.class, this, NsdPackage.TLN_CLASSES__LN_CLASS );
+            lNClass = new EObjectContainmentEList< LNClass >( LNClass.class, this, NsdPackage.LN_CLASSES__LN_CLASS );
         }
         return lNClass;
     }
@@ -127,9 +127,9 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TLN_CLASSES__ABSTRACT_LN_CLASS:
+        case NsdPackage.LN_CLASSES__ABSTRACT_LN_CLASS:
             return ( ( InternalEList< ? > ) getAbstractLNClass() ).basicRemove( otherEnd, msgs );
-        case NsdPackage.TLN_CLASSES__LN_CLASS:
+        case NsdPackage.LN_CLASSES__LN_CLASS:
             return ( ( InternalEList< ? > ) getLNClass() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -143,9 +143,9 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TLN_CLASSES__ABSTRACT_LN_CLASS:
+        case NsdPackage.LN_CLASSES__ABSTRACT_LN_CLASS:
             return getAbstractLNClass();
-        case NsdPackage.TLN_CLASSES__LN_CLASS:
+        case NsdPackage.LN_CLASSES__LN_CLASS:
             return getLNClass();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -160,13 +160,13 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TLN_CLASSES__ABSTRACT_LN_CLASS:
+        case NsdPackage.LN_CLASSES__ABSTRACT_LN_CLASS:
             getAbstractLNClass().clear();
-            getAbstractLNClass().addAll( ( Collection< ? extends TAbstractLNClass > ) newValue );
+            getAbstractLNClass().addAll( ( Collection< ? extends AbstractLNClass > ) newValue );
             return;
-        case NsdPackage.TLN_CLASSES__LN_CLASS:
+        case NsdPackage.LN_CLASSES__LN_CLASS:
             getLNClass().clear();
-            getLNClass().addAll( ( Collection< ? extends TLNClass > ) newValue );
+            getLNClass().addAll( ( Collection< ? extends LNClass > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -180,10 +180,10 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TLN_CLASSES__ABSTRACT_LN_CLASS:
+        case NsdPackage.LN_CLASSES__ABSTRACT_LN_CLASS:
             getAbstractLNClass().clear();
             return;
-        case NsdPackage.TLN_CLASSES__LN_CLASS:
+        case NsdPackage.LN_CLASSES__LN_CLASS:
             getLNClass().clear();
             return;
         }
@@ -198,12 +198,12 @@ public class TLNClassesImpl extends MinimalEObjectImpl.Container implements TLNC
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TLN_CLASSES__ABSTRACT_LN_CLASS:
+        case NsdPackage.LN_CLASSES__ABSTRACT_LN_CLASS:
             return abstractLNClass != null && !abstractLNClass.isEmpty();
-        case NsdPackage.TLN_CLASSES__LN_CLASS:
+        case NsdPackage.LN_CLASSES__LN_CLASS:
             return lNClass != null && !lNClass.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TLNClassesImpl
+} //LNClassesImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLicenseImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LicenseImpl.java
similarity index 82%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLicenseImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LicenseImpl.java
index c0febec305698859fcd4eba6a0232863f24d005f..bfa9cb8847965efd7cd167a35d11aa19d3005439 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLicenseImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LicenseImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.License;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -38,20 +38,20 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TLicense</b></em>'.
+ * An implementation of the model object '<em><b>License</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLicenseImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLicenseImpl#getKind <em>Kind</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLicenseImpl#getUri <em>Uri</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LicenseImpl#getMixed <em>Mixed</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LicenseImpl#getKind <em>Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LicenseImpl#getUri <em>Uri</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicense {
+public class LicenseImpl extends MinimalEObjectImpl.Container implements License {
     /**
      * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
      * <!-- begin-user-doc -->
@@ -70,7 +70,7 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
      * @generated
      * @ordered
      */
-    protected static final TLicenseKind KIND_EDEFAULT = TLicenseKind.STANDARD;
+    protected static final LicenseKind KIND_EDEFAULT = LicenseKind.STANDARD;
 
     /**
      * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
@@ -80,7 +80,7 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
      * @generated
      * @ordered
      */
-    protected TLicenseKind kind = KIND_EDEFAULT;
+    protected LicenseKind kind = KIND_EDEFAULT;
 
     /**
      * This is true if the Kind attribute has been set.
@@ -116,7 +116,7 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TLicenseImpl() {
+    protected LicenseImpl() {
         super();
     }
 
@@ -127,7 +127,7 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TLICENSE;
+        return NsdPackage.Literals.LICENSE;
     }
 
     /**
@@ -138,7 +138,7 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
     @Override
     public FeatureMap getMixed() {
         if( mixed == null ) {
-            mixed = new BasicFeatureMap( this, NsdPackage.TLICENSE__MIXED );
+            mixed = new BasicFeatureMap( this, NsdPackage.LICENSE__MIXED );
         }
         return mixed;
     }
@@ -149,7 +149,7 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
      * @generated
      */
     @Override
-    public TLicenseKind getKind() {
+    public LicenseKind getKind() {
         return kind;
     }
 
@@ -159,12 +159,12 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
      * @generated
      */
     @Override
-    public void setKind( TLicenseKind newKind ) {
-        TLicenseKind oldKind = kind;
+    public void setKind( LicenseKind newKind ) {
+        LicenseKind oldKind = kind;
         kind = newKind == null ? KIND_EDEFAULT : newKind;
         boolean oldKindESet = kindESet;
         kindESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TLICENSE__KIND,
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LICENSE__KIND,
                 oldKind, kind, !oldKindESet ) );
     }
 
@@ -175,12 +175,12 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
      */
     @Override
     public void unsetKind() {
-        TLicenseKind oldKind = kind;
+        LicenseKind oldKind = kind;
         boolean oldKindESet = kindESet;
         kind = KIND_EDEFAULT;
         kindESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TLICENSE__KIND, oldKind, KIND_EDEFAULT, oldKindESet ) );
+                NsdPackage.LICENSE__KIND, oldKind, KIND_EDEFAULT, oldKindESet ) );
     }
 
     /**
@@ -213,7 +213,7 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
         String oldUri = uri;
         uri = newUri;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TLICENSE__URI, oldUri, uri ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LICENSE__URI, oldUri, uri ) );
     }
 
     /**
@@ -224,7 +224,7 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TLICENSE__MIXED:
+        case NsdPackage.LICENSE__MIXED:
             return ( ( InternalEList< ? > ) getMixed() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -238,12 +238,12 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TLICENSE__MIXED:
+        case NsdPackage.LICENSE__MIXED:
             if( coreType ) return getMixed();
             return ( ( FeatureMap.Internal ) getMixed() ).getWrapper();
-        case NsdPackage.TLICENSE__KIND:
+        case NsdPackage.LICENSE__KIND:
             return getKind();
-        case NsdPackage.TLICENSE__URI:
+        case NsdPackage.LICENSE__URI:
             return getUri();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -257,13 +257,13 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TLICENSE__MIXED:
+        case NsdPackage.LICENSE__MIXED:
             ( ( FeatureMap.Internal ) getMixed() ).set( newValue );
             return;
-        case NsdPackage.TLICENSE__KIND:
-            setKind( ( TLicenseKind ) newValue );
+        case NsdPackage.LICENSE__KIND:
+            setKind( ( LicenseKind ) newValue );
             return;
-        case NsdPackage.TLICENSE__URI:
+        case NsdPackage.LICENSE__URI:
             setUri( ( String ) newValue );
             return;
         }
@@ -278,13 +278,13 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TLICENSE__MIXED:
+        case NsdPackage.LICENSE__MIXED:
             getMixed().clear();
             return;
-        case NsdPackage.TLICENSE__KIND:
+        case NsdPackage.LICENSE__KIND:
             unsetKind();
             return;
-        case NsdPackage.TLICENSE__URI:
+        case NsdPackage.LICENSE__URI:
             setUri( URI_EDEFAULT );
             return;
         }
@@ -299,11 +299,11 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TLICENSE__MIXED:
+        case NsdPackage.LICENSE__MIXED:
             return mixed != null && !mixed.isEmpty();
-        case NsdPackage.TLICENSE__KIND:
+        case NsdPackage.LICENSE__KIND:
             return isSetKind();
-        case NsdPackage.TLICENSE__URI:
+        case NsdPackage.LICENSE__URI:
             return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals( uri );
         }
         return super.eIsSet( featureID );
@@ -332,4 +332,4 @@ public class TLicenseImpl extends MinimalEObjectImpl.Container implements TLicen
         return result.toString();
     }
 
-} //TLicenseImpl
+} //LicenseImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLiteralImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java
similarity index 86%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLiteralImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java
index acec76cba6f6d77e14b10890df436f8b3def6567..bad0005834905734fe758658c3624a97bd1808f0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TLiteralImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -30,19 +30,19 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TLiteral</b></em>'.
+ * An implementation of the model object '<em><b>Literal</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLiteralImpl#getLiteralVal <em>Literal Val</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TLiteralImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LiteralImpl#getLiteralVal <em>Literal Val</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.LiteralImpl#getName <em>Name</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
+public class LiteralImpl extends DocumentedClassImpl implements Literal {
     /**
      * The default value of the '{@link #getLiteralVal() <em>Literal Val</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -97,7 +97,7 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TLiteralImpl() {
+    protected LiteralImpl() {
         super();
     }
 
@@ -108,7 +108,7 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TLITERAL;
+        return NsdPackage.Literals.LITERAL;
     }
 
     /**
@@ -133,7 +133,7 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
         boolean oldLiteralValESet = literalValESet;
         literalValESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TLITERAL__LITERAL_VAL, oldLiteralVal, literalVal, !oldLiteralValESet ) );
+                NsdPackage.LITERAL__LITERAL_VAL, oldLiteralVal, literalVal, !oldLiteralValESet ) );
     }
 
     /**
@@ -148,7 +148,7 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
         literalVal = LITERAL_VAL_EDEFAULT;
         literalValESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TLITERAL__LITERAL_VAL, oldLiteralVal, LITERAL_VAL_EDEFAULT, oldLiteralValESet ) );
+                NsdPackage.LITERAL__LITERAL_VAL, oldLiteralVal, LITERAL_VAL_EDEFAULT, oldLiteralValESet ) );
     }
 
     /**
@@ -181,7 +181,7 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
         String oldName = name;
         name = newName;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TLITERAL__NAME, oldName, name ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LITERAL__NAME, oldName, name ) );
     }
 
     /**
@@ -192,9 +192,9 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TLITERAL__LITERAL_VAL:
+        case NsdPackage.LITERAL__LITERAL_VAL:
             return getLiteralVal();
-        case NsdPackage.TLITERAL__NAME:
+        case NsdPackage.LITERAL__NAME:
             return getName();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -208,10 +208,10 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TLITERAL__LITERAL_VAL:
+        case NsdPackage.LITERAL__LITERAL_VAL:
             setLiteralVal( ( Integer ) newValue );
             return;
-        case NsdPackage.TLITERAL__NAME:
+        case NsdPackage.LITERAL__NAME:
             setName( ( String ) newValue );
             return;
         }
@@ -226,10 +226,10 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TLITERAL__LITERAL_VAL:
+        case NsdPackage.LITERAL__LITERAL_VAL:
             unsetLiteralVal();
             return;
-        case NsdPackage.TLITERAL__NAME:
+        case NsdPackage.LITERAL__NAME:
             setName( NAME_EDEFAULT );
             return;
         }
@@ -244,9 +244,9 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TLITERAL__LITERAL_VAL:
+        case NsdPackage.LITERAL__LITERAL_VAL:
             return isSetLiteralVal();
-        case NsdPackage.TLITERAL__NAME:
+        case NsdPackage.LITERAL__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
         }
         return super.eIsSet( featureID );
@@ -273,4 +273,4 @@ public class TLiteralImpl extends TDocumentedClassImpl implements TLiteral {
         return result.toString();
     }
 
-} //TLiteralImpl
+} //LiteralImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDObjectWithVersionAndReleaseImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDObjectWithVersionAndReleaseImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..55839db82b796926d2c072afa278e3a1ac2864f4
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDObjectWithVersionAndReleaseImpl.java
@@ -0,0 +1,319 @@
+/**
+ *  Copyright (c) 2019 CentraleSupélec & EDF.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ * 
+ */
+package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
+
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>NSD Object With Version And Release</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDObjectWithVersionAndReleaseImpl#getRelease <em>Release</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDObjectWithVersionAndReleaseImpl#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class NSDObjectWithVersionAndReleaseImpl extends MinimalEObjectImpl.Container
+        implements NSDObjectWithVersionAndRelease {
+    /**
+     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getRelease()
+     * @generated
+     * @ordered
+     */
+    protected static final Integer RELEASE_EDEFAULT = new Integer( 1 );
+
+    /**
+     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getRelease()
+     * @generated
+     * @ordered
+     */
+    protected Integer release = RELEASE_EDEFAULT;
+
+    /**
+     * This is true if the Release attribute has been set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    protected boolean releaseESet;
+
+    /**
+     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getVersion()
+     * @generated
+     * @ordered
+     */
+    protected static final Integer VERSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getVersion()
+     * @generated
+     * @ordered
+     */
+    protected Integer version = VERSION_EDEFAULT;
+
+    /**
+     * This is true if the Version attribute has been set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    protected boolean versionESet;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected NSDObjectWithVersionAndReleaseImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return NsdPackage.Literals.NSD_OBJECT_WITH_VERSION_AND_RELEASE;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Integer getRelease() {
+        return release;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void setRelease( Integer newRelease ) {
+        Integer oldRelease = release;
+        release = newRelease;
+        boolean oldReleaseESet = releaseESet;
+        releaseESet = true;
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
+                NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE, oldRelease, release, !oldReleaseESet ) );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void unsetRelease() {
+        Integer oldRelease = release;
+        boolean oldReleaseESet = releaseESet;
+        release = RELEASE_EDEFAULT;
+        releaseESet = false;
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
+                NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE, oldRelease, RELEASE_EDEFAULT,
+                oldReleaseESet ) );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean isSetRelease() {
+        return releaseESet;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void setVersion( Integer newVersion ) {
+        Integer oldVersion = version;
+        version = newVersion;
+        boolean oldVersionESet = versionESet;
+        versionESet = true;
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
+                NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION, oldVersion, version, !oldVersionESet ) );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void unsetVersion() {
+        Integer oldVersion = version;
+        boolean oldVersionESet = versionESet;
+        version = VERSION_EDEFAULT;
+        versionESet = false;
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
+                NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION, oldVersion, VERSION_EDEFAULT,
+                oldVersionESet ) );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean isSetVersion() {
+        return versionESet;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE:
+            return getRelease();
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION:
+            return getVersion();
+        }
+        return super.eGet( featureID, resolve, coreType );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE:
+            setRelease( ( Integer ) newValue );
+            return;
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION:
+            setVersion( ( Integer ) newValue );
+            return;
+        }
+        super.eSet( featureID, newValue );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE:
+            unsetRelease();
+            return;
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION:
+            unsetVersion();
+            return;
+        }
+        super.eUnset( featureID );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE:
+            return isSetRelease();
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION:
+            return isSetVersion();
+        }
+        return super.eIsSet( featureID );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (release: " );
+        if( releaseESet )
+            result.append( release );
+        else
+            result.append( "<unset>" );
+        result.append( ", version: " );
+        if( versionESet )
+            result.append( version );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
+        return result.toString();
+    }
+
+} //NSDObjectWithVersionAndReleaseImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TNSDocImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDocImpl.java
similarity index 75%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TNSDocImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDocImpl.java
index f51c0f06231b8b9608e8b3ea3d0ffd128af26583..7bb3ad5c8bc56c1218ffb57eecd3b885b39bc1a5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TNSDocImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDocImpl.java
@@ -19,10 +19,11 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage;
 
 import java.util.Collection;
 
@@ -43,238 +44,238 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TNS Doc</b></em>'.
+ * An implementation of the model object '<em><b>NS Doc</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl#getDoc <em>Doc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl#getId <em>Id</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl#getUmlDate <em>Uml Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl#getUmlVersion <em>Uml Version</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSDocImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl#getRelease <em>Release</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl#getDoc <em>Doc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl#getLang <em>Lang</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl#getPublicationStage <em>Publication Stage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl#getRevision <em>Revision</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl#getUmlDate <em>Uml Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSDocImpl#getUmlVersion <em>Uml Version</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
+public class NSDocImpl extends CopyrightedImpl implements NSDoc {
     /**
-     * The cached value of the '{@link #getDoc() <em>Doc</em>}' containment reference list.
+     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getDoc()
+     * @see #getRelease()
      * @generated
      * @ordered
      */
-    protected EList< TDoc > doc;
+    protected static final Integer RELEASE_EDEFAULT = new Integer( 1 );
 
     /**
-     * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getId()
+     * @see #getRelease()
      * @generated
      * @ordered
      */
-    protected static final String ID_EDEFAULT = null;
+    protected Integer release = RELEASE_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+     * This is true if the Release attribute has been set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getId()
      * @generated
      * @ordered
      */
-    protected String id = ID_EDEFAULT;
+    protected boolean releaseESet;
 
     /**
-     * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
+     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getLang()
+     * @see #getVersion()
      * @generated
      * @ordered
      */
-    protected static final String LANG_EDEFAULT = null;
+    protected static final Integer VERSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
+     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getLang()
+     * @see #getVersion()
      * @generated
      * @ordered
      */
-    protected String lang = LANG_EDEFAULT;
+    protected Integer version = VERSION_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getPublicationStage() <em>Publication Stage</em>}' attribute.
+     * This is true if the Version attribute has been set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getPublicationStage()
      * @generated
      * @ordered
      */
-    protected static final TPubStage PUBLICATION_STAGE_EDEFAULT = TPubStage.IS;
+    protected boolean versionESet;
 
     /**
-     * The cached value of the '{@link #getPublicationStage() <em>Publication Stage</em>}' attribute.
+     * The cached value of the '{@link #getDoc() <em>Doc</em>}' containment reference list.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getPublicationStage()
+     * @see #getDoc()
      * @generated
      * @ordered
      */
-    protected TPubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
+    protected EList< Doc > doc;
 
     /**
-     * This is true if the Publication Stage attribute has been set.
+     * The default value of the '{@link #getId() <em>Id</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @see #getId()
      * @generated
      * @ordered
      */
-    protected boolean publicationStageESet;
+    protected static final String ID_EDEFAULT = null;
 
     /**
-     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
+     * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getRelease()
+     * @see #getId()
      * @generated
      * @ordered
      */
-    protected static final short RELEASE_EDEFAULT = 1;
+    protected String id = ID_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
+     * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getRelease()
+     * @see #getLang()
      * @generated
      * @ordered
      */
-    protected short release = RELEASE_EDEFAULT;
+    protected static final String LANG_EDEFAULT = null;
 
     /**
-     * This is true if the Release attribute has been set.
+     * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @see #getLang()
      * @generated
      * @ordered
      */
-    protected boolean releaseESet;
+    protected String lang = LANG_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getRevision() <em>Revision</em>}' attribute.
+     * The default value of the '{@link #getPublicationStage() <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getRevision()
+     * @see #getPublicationStage()
      * @generated
      * @ordered
      */
-    protected static final String REVISION_EDEFAULT = "A";
+    protected static final PubStage PUBLICATION_STAGE_EDEFAULT = PubStage.IS;
 
     /**
-     * The cached value of the '{@link #getRevision() <em>Revision</em>}' attribute.
+     * The cached value of the '{@link #getPublicationStage() <em>Publication Stage</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getRevision()
+     * @see #getPublicationStage()
      * @generated
      * @ordered
      */
-    protected String revision = REVISION_EDEFAULT;
+    protected PubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
 
     /**
-     * This is true if the Revision attribute has been set.
+     * This is true if the Publication Stage attribute has been set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    protected boolean revisionESet;
+    protected boolean publicationStageESet;
 
     /**
-     * The default value of the '{@link #getUmlDate() <em>Uml Date</em>}' attribute.
+     * The default value of the '{@link #getRevision() <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getUmlDate()
+     * @see #getRevision()
      * @generated
      * @ordered
      */
-    protected static final XMLGregorianCalendar UML_DATE_EDEFAULT = null;
+    protected static final String REVISION_EDEFAULT = "A";
 
     /**
-     * The cached value of the '{@link #getUmlDate() <em>Uml Date</em>}' attribute.
+     * The cached value of the '{@link #getRevision() <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getUmlDate()
+     * @see #getRevision()
      * @generated
      * @ordered
      */
-    protected XMLGregorianCalendar umlDate = UML_DATE_EDEFAULT;
+    protected String revision = REVISION_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getUmlVersion() <em>Uml Version</em>}' attribute.
+     * This is true if the Revision attribute has been set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getUmlVersion()
      * @generated
      * @ordered
      */
-    protected static final String UML_VERSION_EDEFAULT = null;
+    protected boolean revisionESet;
 
     /**
-     * The cached value of the '{@link #getUmlVersion() <em>Uml Version</em>}' attribute.
+     * The default value of the '{@link #getUmlDate() <em>Uml Date</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getUmlVersion()
+     * @see #getUmlDate()
      * @generated
      * @ordered
      */
-    protected String umlVersion = UML_VERSION_EDEFAULT;
+    protected static final XMLGregorianCalendar UML_DATE_EDEFAULT = null;
 
     /**
-     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+     * The cached value of the '{@link #getUmlDate() <em>Uml Date</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getVersion()
+     * @see #getUmlDate()
      * @generated
      * @ordered
      */
-    protected static final int VERSION_EDEFAULT = 0;
+    protected XMLGregorianCalendar umlDate = UML_DATE_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+     * The default value of the '{@link #getUmlVersion() <em>Uml Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getVersion()
+     * @see #getUmlVersion()
      * @generated
      * @ordered
      */
-    protected int version = VERSION_EDEFAULT;
+    protected static final String UML_VERSION_EDEFAULT = null;
 
     /**
-     * This is true if the Version attribute has been set.
+     * The cached value of the '{@link #getUmlVersion() <em>Uml Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @see #getUmlVersion()
      * @generated
      * @ordered
      */
-    protected boolean versionESet;
+    protected String umlVersion = UML_VERSION_EDEFAULT;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TNSDocImpl() {
+    protected NSDocImpl() {
         super();
     }
 
@@ -285,7 +286,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TNS_DOC;
+        return NsdPackage.Literals.NS_DOC;
     }
 
     /**
@@ -294,9 +295,9 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      * @generated
      */
     @Override
-    public EList< TDoc > getDoc() {
+    public EList< Doc > getDoc() {
         if( doc == null ) {
-            doc = new EObjectContainmentEList< TDoc >( TDoc.class, this, NsdPackage.TNS_DOC__DOC );
+            doc = new EObjectContainmentEList< Doc >( Doc.class, this, NsdPackage.NS_DOC__DOC );
         }
         return doc;
     }
@@ -321,7 +322,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
         String oldId = id;
         id = newId;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS_DOC__ID, oldId, id ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__ID, oldId, id ) );
     }
 
     /**
@@ -344,7 +345,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
         String oldLang = lang;
         lang = newLang;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS_DOC__LANG, oldLang, lang ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__LANG, oldLang, lang ) );
     }
 
     /**
@@ -353,7 +354,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      * @generated
      */
     @Override
-    public TPubStage getPublicationStage() {
+    public PubStage getPublicationStage() {
         return publicationStage;
     }
 
@@ -363,13 +364,13 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      * @generated
      */
     @Override
-    public void setPublicationStage( TPubStage newPublicationStage ) {
-        TPubStage oldPublicationStage = publicationStage;
+    public void setPublicationStage( PubStage newPublicationStage ) {
+        PubStage oldPublicationStage = publicationStage;
         publicationStage = newPublicationStage == null ? PUBLICATION_STAGE_EDEFAULT : newPublicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStageESet = true;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS_DOC__PUBLICATION_STAGE,
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__PUBLICATION_STAGE,
                     oldPublicationStage, publicationStage, !oldPublicationStageESet ) );
     }
 
@@ -380,12 +381,12 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      */
     @Override
     public void unsetPublicationStage() {
-        TPubStage oldPublicationStage = publicationStage;
+        PubStage oldPublicationStage = publicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStage = PUBLICATION_STAGE_EDEFAULT;
         publicationStageESet = false;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TNS_DOC__PUBLICATION_STAGE,
+            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__PUBLICATION_STAGE,
                     oldPublicationStage, PUBLICATION_STAGE_EDEFAULT, oldPublicationStageESet ) );
     }
 
@@ -405,7 +406,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      * @generated
      */
     @Override
-    public short getRelease() {
+    public Integer getRelease() {
         return release;
     }
 
@@ -415,13 +416,13 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      * @generated
      */
     @Override
-    public void setRelease( short newRelease ) {
-        short oldRelease = release;
+    public void setRelease( Integer newRelease ) {
+        Integer oldRelease = release;
         release = newRelease;
         boolean oldReleaseESet = releaseESet;
         releaseESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS_DOC__RELEASE, oldRelease, release, !oldReleaseESet ) );
+                NsdPackage.NS_DOC__RELEASE, oldRelease, release, !oldReleaseESet ) );
     }
 
     /**
@@ -431,12 +432,12 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      */
     @Override
     public void unsetRelease() {
-        short oldRelease = release;
+        Integer oldRelease = release;
         boolean oldReleaseESet = releaseESet;
         release = RELEASE_EDEFAULT;
         releaseESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TNS_DOC__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) );
+                NsdPackage.NS_DOC__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) );
     }
 
     /**
@@ -471,7 +472,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
         boolean oldRevisionESet = revisionESet;
         revisionESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS_DOC__REVISION, oldRevision, revision, !oldRevisionESet ) );
+                NsdPackage.NS_DOC__REVISION, oldRevision, revision, !oldRevisionESet ) );
     }
 
     /**
@@ -486,7 +487,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
         revision = REVISION_EDEFAULT;
         revisionESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TNS_DOC__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
+                NsdPackage.NS_DOC__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
     }
 
     /**
@@ -519,7 +520,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
         XMLGregorianCalendar oldUmlDate = umlDate;
         umlDate = newUmlDate;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TNS_DOC__UML_DATE, oldUmlDate, umlDate ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__UML_DATE, oldUmlDate, umlDate ) );
     }
 
     /**
@@ -542,7 +543,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
         String oldUmlVersion = umlVersion;
         umlVersion = newUmlVersion;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS_DOC__UML_VERSION, oldUmlVersion, umlVersion ) );
+                NsdPackage.NS_DOC__UML_VERSION, oldUmlVersion, umlVersion ) );
     }
 
     /**
@@ -551,7 +552,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      * @generated
      */
     @Override
-    public int getVersion() {
+    public Integer getVersion() {
         return version;
     }
 
@@ -561,13 +562,13 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      * @generated
      */
     @Override
-    public void setVersion( int newVersion ) {
-        int oldVersion = version;
+    public void setVersion( Integer newVersion ) {
+        Integer oldVersion = version;
         version = newVersion;
         boolean oldVersionESet = versionESet;
         versionESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS_DOC__VERSION, oldVersion, version, !oldVersionESet ) );
+                NsdPackage.NS_DOC__VERSION, oldVersion, version, !oldVersionESet ) );
     }
 
     /**
@@ -577,12 +578,12 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
      */
     @Override
     public void unsetVersion() {
-        int oldVersion = version;
+        Integer oldVersion = version;
         boolean oldVersionESet = versionESet;
         version = VERSION_EDEFAULT;
         versionESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TNS_DOC__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
+                NsdPackage.NS_DOC__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
     }
 
     /**
@@ -603,7 +604,7 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TNS_DOC__DOC:
+        case NsdPackage.NS_DOC__DOC:
             return ( ( InternalEList< ? > ) getDoc() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -617,24 +618,24 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TNS_DOC__DOC:
+        case NsdPackage.NS_DOC__RELEASE:
+            return getRelease();
+        case NsdPackage.NS_DOC__VERSION:
+            return getVersion();
+        case NsdPackage.NS_DOC__DOC:
             return getDoc();
-        case NsdPackage.TNS_DOC__ID:
+        case NsdPackage.NS_DOC__ID:
             return getId();
-        case NsdPackage.TNS_DOC__LANG:
+        case NsdPackage.NS_DOC__LANG:
             return getLang();
-        case NsdPackage.TNS_DOC__PUBLICATION_STAGE:
+        case NsdPackage.NS_DOC__PUBLICATION_STAGE:
             return getPublicationStage();
-        case NsdPackage.TNS_DOC__RELEASE:
-            return getRelease();
-        case NsdPackage.TNS_DOC__REVISION:
+        case NsdPackage.NS_DOC__REVISION:
             return getRevision();
-        case NsdPackage.TNS_DOC__UML_DATE:
+        case NsdPackage.NS_DOC__UML_DATE:
             return getUmlDate();
-        case NsdPackage.TNS_DOC__UML_VERSION:
+        case NsdPackage.NS_DOC__UML_VERSION:
             return getUmlVersion();
-        case NsdPackage.TNS_DOC__VERSION:
-            return getVersion();
         }
         return super.eGet( featureID, resolve, coreType );
     }
@@ -648,34 +649,34 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TNS_DOC__DOC:
+        case NsdPackage.NS_DOC__RELEASE:
+            setRelease( ( Integer ) newValue );
+            return;
+        case NsdPackage.NS_DOC__VERSION:
+            setVersion( ( Integer ) newValue );
+            return;
+        case NsdPackage.NS_DOC__DOC:
             getDoc().clear();
-            getDoc().addAll( ( Collection< ? extends TDoc > ) newValue );
+            getDoc().addAll( ( Collection< ? extends Doc > ) newValue );
             return;
-        case NsdPackage.TNS_DOC__ID:
+        case NsdPackage.NS_DOC__ID:
             setId( ( String ) newValue );
             return;
-        case NsdPackage.TNS_DOC__LANG:
+        case NsdPackage.NS_DOC__LANG:
             setLang( ( String ) newValue );
             return;
-        case NsdPackage.TNS_DOC__PUBLICATION_STAGE:
-            setPublicationStage( ( TPubStage ) newValue );
-            return;
-        case NsdPackage.TNS_DOC__RELEASE:
-            setRelease( ( Short ) newValue );
+        case NsdPackage.NS_DOC__PUBLICATION_STAGE:
+            setPublicationStage( ( PubStage ) newValue );
             return;
-        case NsdPackage.TNS_DOC__REVISION:
+        case NsdPackage.NS_DOC__REVISION:
             setRevision( ( String ) newValue );
             return;
-        case NsdPackage.TNS_DOC__UML_DATE:
+        case NsdPackage.NS_DOC__UML_DATE:
             setUmlDate( ( XMLGregorianCalendar ) newValue );
             return;
-        case NsdPackage.TNS_DOC__UML_VERSION:
+        case NsdPackage.NS_DOC__UML_VERSION:
             setUmlVersion( ( String ) newValue );
             return;
-        case NsdPackage.TNS_DOC__VERSION:
-            setVersion( ( Integer ) newValue );
-            return;
         }
         super.eSet( featureID, newValue );
     }
@@ -688,33 +689,33 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TNS_DOC__DOC:
+        case NsdPackage.NS_DOC__RELEASE:
+            unsetRelease();
+            return;
+        case NsdPackage.NS_DOC__VERSION:
+            unsetVersion();
+            return;
+        case NsdPackage.NS_DOC__DOC:
             getDoc().clear();
             return;
-        case NsdPackage.TNS_DOC__ID:
+        case NsdPackage.NS_DOC__ID:
             setId( ID_EDEFAULT );
             return;
-        case NsdPackage.TNS_DOC__LANG:
+        case NsdPackage.NS_DOC__LANG:
             setLang( LANG_EDEFAULT );
             return;
-        case NsdPackage.TNS_DOC__PUBLICATION_STAGE:
+        case NsdPackage.NS_DOC__PUBLICATION_STAGE:
             unsetPublicationStage();
             return;
-        case NsdPackage.TNS_DOC__RELEASE:
-            unsetRelease();
-            return;
-        case NsdPackage.TNS_DOC__REVISION:
+        case NsdPackage.NS_DOC__REVISION:
             unsetRevision();
             return;
-        case NsdPackage.TNS_DOC__UML_DATE:
+        case NsdPackage.NS_DOC__UML_DATE:
             setUmlDate( UML_DATE_EDEFAULT );
             return;
-        case NsdPackage.TNS_DOC__UML_VERSION:
+        case NsdPackage.NS_DOC__UML_VERSION:
             setUmlVersion( UML_VERSION_EDEFAULT );
             return;
-        case NsdPackage.TNS_DOC__VERSION:
-            unsetVersion();
-            return;
         }
         super.eUnset( featureID );
     }
@@ -727,28 +728,68 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TNS_DOC__DOC:
+        case NsdPackage.NS_DOC__RELEASE:
+            return isSetRelease();
+        case NsdPackage.NS_DOC__VERSION:
+            return isSetVersion();
+        case NsdPackage.NS_DOC__DOC:
             return doc != null && !doc.isEmpty();
-        case NsdPackage.TNS_DOC__ID:
+        case NsdPackage.NS_DOC__ID:
             return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals( id );
-        case NsdPackage.TNS_DOC__LANG:
+        case NsdPackage.NS_DOC__LANG:
             return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals( lang );
-        case NsdPackage.TNS_DOC__PUBLICATION_STAGE:
+        case NsdPackage.NS_DOC__PUBLICATION_STAGE:
             return isSetPublicationStage();
-        case NsdPackage.TNS_DOC__RELEASE:
-            return isSetRelease();
-        case NsdPackage.TNS_DOC__REVISION:
+        case NsdPackage.NS_DOC__REVISION:
             return isSetRevision();
-        case NsdPackage.TNS_DOC__UML_DATE:
+        case NsdPackage.NS_DOC__UML_DATE:
             return UML_DATE_EDEFAULT == null ? umlDate != null : !UML_DATE_EDEFAULT.equals( umlDate );
-        case NsdPackage.TNS_DOC__UML_VERSION:
+        case NsdPackage.NS_DOC__UML_VERSION:
             return UML_VERSION_EDEFAULT == null ? umlVersion != null : !UML_VERSION_EDEFAULT.equals( umlVersion );
-        case NsdPackage.TNS_DOC__VERSION:
-            return isSetVersion();
         }
         return super.eIsSet( featureID );
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == NSDObjectWithVersionAndRelease.class ) {
+            switch( derivedFeatureID ) {
+            case NsdPackage.NS_DOC__RELEASE:
+                return NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE;
+            case NsdPackage.NS_DOC__VERSION:
+                return NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION;
+            default:
+                return -1;
+            }
+        }
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == NSDObjectWithVersionAndRelease.class ) {
+            switch( baseFeatureID ) {
+            case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE:
+                return NsdPackage.NS_DOC__RELEASE;
+            case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION:
+                return NsdPackage.NS_DOC__VERSION;
+            default:
+                return -1;
+            }
+        }
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
+    }
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -759,7 +800,17 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
         if( eIsProxy() ) return super.toString();
 
         StringBuilder result = new StringBuilder( super.toString() );
-        result.append( " (id: " );
+        result.append( " (release: " );
+        if( releaseESet )
+            result.append( release );
+        else
+            result.append( "<unset>" );
+        result.append( ", version: " );
+        if( versionESet )
+            result.append( version );
+        else
+            result.append( "<unset>" );
+        result.append( ", id: " );
         result.append( id );
         result.append( ", lang: " );
         result.append( lang );
@@ -768,11 +819,6 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
             result.append( publicationStage );
         else
             result.append( "<unset>" );
-        result.append( ", release: " );
-        if( releaseESet )
-            result.append( release );
-        else
-            result.append( "<unset>" );
         result.append( ", revision: " );
         if( revisionESet )
             result.append( revision );
@@ -782,13 +828,8 @@ public class TNSDocImpl extends TCopyrightedImpl implements TNSDoc {
         result.append( umlDate );
         result.append( ", umlVersion: " );
         result.append( umlVersion );
-        result.append( ", version: " );
-        if( versionESet )
-            result.append( version );
-        else
-            result.append( "<unset>" );
         result.append( ')' );
         return result.toString();
     }
 
-} //TNSDocImpl
+} //NSDocImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TNSImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java
similarity index 68%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TNSImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java
index f6092e3edbc60f547bf26ac27d24c90c593808d8..7895fe7adeb77f2baa85fdab1b2ea32c91a7f6ab 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TNSImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java
@@ -19,19 +19,20 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
@@ -45,35 +46,93 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TNS</b></em>'.
+ * An implementation of the model object '<em><b>NS</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getChanges <em>Changes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getDependsOn <em>Depends On</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getBasicTypes <em>Basic Types</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getFunctionalConstraints <em>Functional Constraints</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getPresenceConditions <em>Presence Conditions</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getAbbreviations <em>Abbreviations</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getEnumerations <em>Enumerations</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getConstructedAttributes <em>Constructed Attributes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getCDCs <em>CD Cs</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getLNClasses <em>LN Classes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getId <em>Id</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getUmlDate <em>Uml Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getUmlVersion <em>Uml Version</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNSImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getRelease <em>Release</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getChanges <em>Changes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getDependsOn <em>Depends On</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getBasicTypes <em>Basic Types</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getFunctionalConstraints <em>Functional Constraints</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getPresenceConditions <em>Presence Conditions</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getAbbreviations <em>Abbreviations</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getEnumerations <em>Enumerations</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getConstructedAttributes <em>Constructed Attributes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getCDCs <em>CD Cs</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getLNClasses <em>LN Classes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getPublicationStage <em>Publication Stage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getRevision <em>Revision</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getUmlDate <em>Uml Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NSImpl#getUmlVersion <em>Uml Version</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TNSImpl extends TCopyrightedImpl implements TNS {
+public class NSImpl extends CopyrightedImpl implements NS {
+    /**
+     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getRelease()
+     * @generated
+     * @ordered
+     */
+    protected static final Integer RELEASE_EDEFAULT = new Integer( 1 );
+
+    /**
+     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getRelease()
+     * @generated
+     * @ordered
+     */
+    protected Integer release = RELEASE_EDEFAULT;
+
+    /**
+     * This is true if the Release attribute has been set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    protected boolean releaseESet;
+
+    /**
+     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getVersion()
+     * @generated
+     * @ordered
+     */
+    protected static final Integer VERSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getVersion()
+     * @generated
+     * @ordered
+     */
+    protected Integer version = VERSION_EDEFAULT;
+
+    /**
+     * This is true if the Version attribute has been set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    protected boolean versionESet;
+
     /**
      * The cached value of the '{@link #getChanges() <em>Changes</em>}' containment reference.
      * <!-- begin-user-doc -->
@@ -82,7 +141,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TChanges changes;
+    protected Changes changes;
 
     /**
      * The cached value of the '{@link #getDependsOn() <em>Depends On</em>}' containment reference.
@@ -102,7 +161,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TBasicTypes basicTypes;
+    protected BasicTypes basicTypes;
 
     /**
      * The cached value of the '{@link #getFunctionalConstraints() <em>Functional Constraints</em>}' containment reference.
@@ -112,7 +171,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TFunctionalConstraints functionalConstraints;
+    protected FunctionalConstraints functionalConstraints;
 
     /**
      * The cached value of the '{@link #getPresenceConditions() <em>Presence Conditions</em>}' containment reference.
@@ -122,7 +181,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TPresenceConditions presenceConditions;
+    protected PresenceConditions presenceConditions;
 
     /**
      * The cached value of the '{@link #getAbbreviations() <em>Abbreviations</em>}' containment reference.
@@ -132,7 +191,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TAbbreviations abbreviations;
+    protected Abbreviations abbreviations;
 
     /**
      * The cached value of the '{@link #getEnumerations() <em>Enumerations</em>}' containment reference.
@@ -142,7 +201,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TEnumerations enumerations;
+    protected Enumerations enumerations;
 
     /**
      * The cached value of the '{@link #getConstructedAttributes() <em>Constructed Attributes</em>}' containment reference.
@@ -152,7 +211,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TConstructedAttributes constructedAttributes;
+    protected ConstructedAttributes constructedAttributes;
 
     /**
      * The cached value of the '{@link #getCDCs() <em>CD Cs</em>}' containment reference.
@@ -162,7 +221,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TCDCs cDCs;
+    protected CDCs cDCs;
 
     /**
      * The cached value of the '{@link #getLNClasses() <em>LN Classes</em>}' containment reference.
@@ -172,7 +231,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TLNClasses lNClasses;
+    protected LNClasses lNClasses;
 
     /**
      * The default value of the '{@link #getDescID() <em>Desc ID</em>}' attribute.
@@ -222,7 +281,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected static final TPubStage PUBLICATION_STAGE_EDEFAULT = TPubStage.IS;
+    protected static final PubStage PUBLICATION_STAGE_EDEFAULT = PubStage.IS;
 
     /**
      * The cached value of the '{@link #getPublicationStage() <em>Publication Stage</em>}' attribute.
@@ -232,7 +291,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      * @ordered
      */
-    protected TPubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
+    protected PubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
 
     /**
      * This is true if the Publication Stage attribute has been set.
@@ -243,35 +302,6 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      */
     protected boolean publicationStageESet;
 
-    /**
-     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected static final short RELEASE_EDEFAULT = 1;
-
-    /**
-     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected short release = RELEASE_EDEFAULT;
-
-    /**
-     * This is true if the Release attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean releaseESet;
-
     /**
      * The default value of the '{@link #getRevision() <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -342,40 +372,11 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
     protected String umlVersion = UML_VERSION_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getVersion()
      * @generated
-     * @ordered
      */
-    protected static final int VERSION_EDEFAULT = 0;
-
-    /**
-     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected int version = VERSION_EDEFAULT;
-
-    /**
-     * This is true if the Version attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean versionESet;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected TNSImpl() {
+    protected NSImpl() {
         super();
     }
 
@@ -386,7 +387,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TNS;
+        return NsdPackage.Literals.NS;
     }
 
     /**
@@ -395,7 +396,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TChanges getChanges() {
+    public Changes getChanges() {
         return changes;
     }
 
@@ -404,11 +405,11 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetChanges( TChanges newChanges, NotificationChain msgs ) {
-        TChanges oldChanges = changes;
+    public NotificationChain basicSetChanges( Changes newChanges, NotificationChain msgs ) {
+        Changes oldChanges = changes;
         changes = newChanges;
         if( eNotificationRequired() ) {
-            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__CHANGES,
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.NS__CHANGES,
                     oldChanges, newChanges );
             if( msgs == null )
                 msgs = notification;
@@ -424,18 +425,18 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setChanges( TChanges newChanges ) {
+    public void setChanges( Changes newChanges ) {
         if( newChanges != changes ) {
             NotificationChain msgs = null;
             if( changes != null ) msgs = ( ( InternalEObject ) changes ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__CHANGES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CHANGES, null, msgs );
             if( newChanges != null ) msgs = ( ( InternalEObject ) newChanges ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__CHANGES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CHANGES, null, msgs );
             msgs = basicSetChanges( newChanges, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__CHANGES, newChanges, newChanges ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__CHANGES, newChanges, newChanges ) );
     }
 
     /**
@@ -457,7 +458,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         DependsOnType oldDependsOn = dependsOn;
         dependsOn = newDependsOn;
         if( eNotificationRequired() ) {
-            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__DEPENDS_ON,
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.NS__DEPENDS_ON,
                     oldDependsOn, newDependsOn );
             if( msgs == null )
                 msgs = notification;
@@ -477,14 +478,14 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         if( newDependsOn != dependsOn ) {
             NotificationChain msgs = null;
             if( dependsOn != null ) msgs = ( ( InternalEObject ) dependsOn ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__DEPENDS_ON, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__DEPENDS_ON, null, msgs );
             if( newDependsOn != null ) msgs = ( ( InternalEObject ) newDependsOn ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__DEPENDS_ON, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__DEPENDS_ON, null, msgs );
             msgs = basicSetDependsOn( newDependsOn, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__DEPENDS_ON, newDependsOn, newDependsOn ) );
+                NsdPackage.NS__DEPENDS_ON, newDependsOn, newDependsOn ) );
     }
 
     /**
@@ -493,7 +494,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TBasicTypes getBasicTypes() {
+    public BasicTypes getBasicTypes() {
         return basicTypes;
     }
 
@@ -502,11 +503,11 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetBasicTypes( TBasicTypes newBasicTypes, NotificationChain msgs ) {
-        TBasicTypes oldBasicTypes = basicTypes;
+    public NotificationChain basicSetBasicTypes( BasicTypes newBasicTypes, NotificationChain msgs ) {
+        BasicTypes oldBasicTypes = basicTypes;
         basicTypes = newBasicTypes;
         if( eNotificationRequired() ) {
-            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__BASIC_TYPES,
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.NS__BASIC_TYPES,
                     oldBasicTypes, newBasicTypes );
             if( msgs == null )
                 msgs = notification;
@@ -522,18 +523,18 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setBasicTypes( TBasicTypes newBasicTypes ) {
+    public void setBasicTypes( BasicTypes newBasicTypes ) {
         if( newBasicTypes != basicTypes ) {
             NotificationChain msgs = null;
             if( basicTypes != null ) msgs = ( ( InternalEObject ) basicTypes ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__BASIC_TYPES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__BASIC_TYPES, null, msgs );
             if( newBasicTypes != null ) msgs = ( ( InternalEObject ) newBasicTypes ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__BASIC_TYPES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__BASIC_TYPES, null, msgs );
             msgs = basicSetBasicTypes( newBasicTypes, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__BASIC_TYPES, newBasicTypes, newBasicTypes ) );
+                NsdPackage.NS__BASIC_TYPES, newBasicTypes, newBasicTypes ) );
     }
 
     /**
@@ -542,7 +543,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TFunctionalConstraints getFunctionalConstraints() {
+    public FunctionalConstraints getFunctionalConstraints() {
         return functionalConstraints;
     }
 
@@ -551,13 +552,13 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetFunctionalConstraints( TFunctionalConstraints newFunctionalConstraints,
+    public NotificationChain basicSetFunctionalConstraints( FunctionalConstraints newFunctionalConstraints,
             NotificationChain msgs ) {
-        TFunctionalConstraints oldFunctionalConstraints = functionalConstraints;
+        FunctionalConstraints oldFunctionalConstraints = functionalConstraints;
         functionalConstraints = newFunctionalConstraints;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS, oldFunctionalConstraints, newFunctionalConstraints );
+                    NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, oldFunctionalConstraints, newFunctionalConstraints );
             if( msgs == null )
                 msgs = notification;
             else
@@ -572,19 +573,18 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setFunctionalConstraints( TFunctionalConstraints newFunctionalConstraints ) {
+    public void setFunctionalConstraints( FunctionalConstraints newFunctionalConstraints ) {
         if( newFunctionalConstraints != functionalConstraints ) {
             NotificationChain msgs = null;
-            if( functionalConstraints != null )
-                msgs = ( ( InternalEObject ) functionalConstraints ).eInverseRemove( this,
-                        EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS, null, msgs );
+            if( functionalConstraints != null ) msgs = ( ( InternalEObject ) functionalConstraints )
+                    .eInverseRemove( this, EOPPOSITE_FEATURE_BASE - NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, null, msgs );
             if( newFunctionalConstraints != null ) msgs = ( ( InternalEObject ) newFunctionalConstraints )
-                    .eInverseAdd( this, EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS, null, msgs );
+                    .eInverseAdd( this, EOPPOSITE_FEATURE_BASE - NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, null, msgs );
             msgs = basicSetFunctionalConstraints( newFunctionalConstraints, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS, newFunctionalConstraints, newFunctionalConstraints ) );
+                NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, newFunctionalConstraints, newFunctionalConstraints ) );
     }
 
     /**
@@ -593,7 +593,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TPresenceConditions getPresenceConditions() {
+    public PresenceConditions getPresenceConditions() {
         return presenceConditions;
     }
 
@@ -602,13 +602,13 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetPresenceConditions( TPresenceConditions newPresenceConditions,
+    public NotificationChain basicSetPresenceConditions( PresenceConditions newPresenceConditions,
             NotificationChain msgs ) {
-        TPresenceConditions oldPresenceConditions = presenceConditions;
+        PresenceConditions oldPresenceConditions = presenceConditions;
         presenceConditions = newPresenceConditions;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TNS__PRESENCE_CONDITIONS, oldPresenceConditions, newPresenceConditions );
+                    NsdPackage.NS__PRESENCE_CONDITIONS, oldPresenceConditions, newPresenceConditions );
             if( msgs == null )
                 msgs = notification;
             else
@@ -623,18 +623,18 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setPresenceConditions( TPresenceConditions newPresenceConditions ) {
+    public void setPresenceConditions( PresenceConditions newPresenceConditions ) {
         if( newPresenceConditions != presenceConditions ) {
             NotificationChain msgs = null;
             if( presenceConditions != null ) msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__PRESENCE_CONDITIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__PRESENCE_CONDITIONS, null, msgs );
             if( newPresenceConditions != null ) msgs = ( ( InternalEObject ) newPresenceConditions ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__PRESENCE_CONDITIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__PRESENCE_CONDITIONS, null, msgs );
             msgs = basicSetPresenceConditions( newPresenceConditions, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__PRESENCE_CONDITIONS, newPresenceConditions, newPresenceConditions ) );
+                NsdPackage.NS__PRESENCE_CONDITIONS, newPresenceConditions, newPresenceConditions ) );
     }
 
     /**
@@ -643,7 +643,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TAbbreviations getAbbreviations() {
+    public Abbreviations getAbbreviations() {
         return abbreviations;
     }
 
@@ -652,12 +652,12 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetAbbreviations( TAbbreviations newAbbreviations, NotificationChain msgs ) {
-        TAbbreviations oldAbbreviations = abbreviations;
+    public NotificationChain basicSetAbbreviations( Abbreviations newAbbreviations, NotificationChain msgs ) {
+        Abbreviations oldAbbreviations = abbreviations;
         abbreviations = newAbbreviations;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TNS__ABBREVIATIONS, oldAbbreviations, newAbbreviations );
+                    NsdPackage.NS__ABBREVIATIONS, oldAbbreviations, newAbbreviations );
             if( msgs == null )
                 msgs = notification;
             else
@@ -672,18 +672,18 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setAbbreviations( TAbbreviations newAbbreviations ) {
+    public void setAbbreviations( Abbreviations newAbbreviations ) {
         if( newAbbreviations != abbreviations ) {
             NotificationChain msgs = null;
             if( abbreviations != null ) msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__ABBREVIATIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__ABBREVIATIONS, null, msgs );
             if( newAbbreviations != null ) msgs = ( ( InternalEObject ) newAbbreviations ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__ABBREVIATIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__ABBREVIATIONS, null, msgs );
             msgs = basicSetAbbreviations( newAbbreviations, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__ABBREVIATIONS, newAbbreviations, newAbbreviations ) );
+                NsdPackage.NS__ABBREVIATIONS, newAbbreviations, newAbbreviations ) );
     }
 
     /**
@@ -692,7 +692,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TEnumerations getEnumerations() {
+    public Enumerations getEnumerations() {
         return enumerations;
     }
 
@@ -701,12 +701,12 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetEnumerations( TEnumerations newEnumerations, NotificationChain msgs ) {
-        TEnumerations oldEnumerations = enumerations;
+    public NotificationChain basicSetEnumerations( Enumerations newEnumerations, NotificationChain msgs ) {
+        Enumerations oldEnumerations = enumerations;
         enumerations = newEnumerations;
         if( eNotificationRequired() ) {
-            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TNS__ENUMERATIONS, oldEnumerations, newEnumerations );
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.NS__ENUMERATIONS,
+                    oldEnumerations, newEnumerations );
             if( msgs == null )
                 msgs = notification;
             else
@@ -721,18 +721,18 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setEnumerations( TEnumerations newEnumerations ) {
+    public void setEnumerations( Enumerations newEnumerations ) {
         if( newEnumerations != enumerations ) {
             NotificationChain msgs = null;
             if( enumerations != null ) msgs = ( ( InternalEObject ) enumerations ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__ENUMERATIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__ENUMERATIONS, null, msgs );
             if( newEnumerations != null ) msgs = ( ( InternalEObject ) newEnumerations ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__ENUMERATIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__ENUMERATIONS, null, msgs );
             msgs = basicSetEnumerations( newEnumerations, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__ENUMERATIONS, newEnumerations, newEnumerations ) );
+                NsdPackage.NS__ENUMERATIONS, newEnumerations, newEnumerations ) );
     }
 
     /**
@@ -741,7 +741,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TConstructedAttributes getConstructedAttributes() {
+    public ConstructedAttributes getConstructedAttributes() {
         return constructedAttributes;
     }
 
@@ -750,13 +750,13 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetConstructedAttributes( TConstructedAttributes newConstructedAttributes,
+    public NotificationChain basicSetConstructedAttributes( ConstructedAttributes newConstructedAttributes,
             NotificationChain msgs ) {
-        TConstructedAttributes oldConstructedAttributes = constructedAttributes;
+        ConstructedAttributes oldConstructedAttributes = constructedAttributes;
         constructedAttributes = newConstructedAttributes;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES, oldConstructedAttributes, newConstructedAttributes );
+                    NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, oldConstructedAttributes, newConstructedAttributes );
             if( msgs == null )
                 msgs = notification;
             else
@@ -771,19 +771,18 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setConstructedAttributes( TConstructedAttributes newConstructedAttributes ) {
+    public void setConstructedAttributes( ConstructedAttributes newConstructedAttributes ) {
         if( newConstructedAttributes != constructedAttributes ) {
             NotificationChain msgs = null;
-            if( constructedAttributes != null )
-                msgs = ( ( InternalEObject ) constructedAttributes ).eInverseRemove( this,
-                        EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES, null, msgs );
+            if( constructedAttributes != null ) msgs = ( ( InternalEObject ) constructedAttributes )
+                    .eInverseRemove( this, EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, null, msgs );
             if( newConstructedAttributes != null ) msgs = ( ( InternalEObject ) newConstructedAttributes )
-                    .eInverseAdd( this, EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES, null, msgs );
+                    .eInverseAdd( this, EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, null, msgs );
             msgs = basicSetConstructedAttributes( newConstructedAttributes, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES, newConstructedAttributes, newConstructedAttributes ) );
+                NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, newConstructedAttributes, newConstructedAttributes ) );
     }
 
     /**
@@ -792,7 +791,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TCDCs getCDCs() {
+    public CDCs getCDCs() {
         return cDCs;
     }
 
@@ -801,11 +800,11 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetCDCs( TCDCs newCDCs, NotificationChain msgs ) {
-        TCDCs oldCDCs = cDCs;
+    public NotificationChain basicSetCDCs( CDCs newCDCs, NotificationChain msgs ) {
+        CDCs oldCDCs = cDCs;
         cDCs = newCDCs;
         if( eNotificationRequired() ) {
-            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__CD_CS,
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.NS__CD_CS,
                     oldCDCs, newCDCs );
             if( msgs == null )
                 msgs = notification;
@@ -821,18 +820,18 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setCDCs( TCDCs newCDCs ) {
+    public void setCDCs( CDCs newCDCs ) {
         if( newCDCs != cDCs ) {
             NotificationChain msgs = null;
             if( cDCs != null ) msgs = ( ( InternalEObject ) cDCs ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__CD_CS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CD_CS, null, msgs );
             if( newCDCs != null ) msgs = ( ( InternalEObject ) newCDCs ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__CD_CS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CD_CS, null, msgs );
             msgs = basicSetCDCs( newCDCs, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__CD_CS, newCDCs, newCDCs ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__CD_CS, newCDCs, newCDCs ) );
     }
 
     /**
@@ -841,7 +840,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TLNClasses getLNClasses() {
+    public LNClasses getLNClasses() {
         return lNClasses;
     }
 
@@ -850,11 +849,11 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetLNClasses( TLNClasses newLNClasses, NotificationChain msgs ) {
-        TLNClasses oldLNClasses = lNClasses;
+    public NotificationChain basicSetLNClasses( LNClasses newLNClasses, NotificationChain msgs ) {
+        LNClasses oldLNClasses = lNClasses;
         lNClasses = newLNClasses;
         if( eNotificationRequired() ) {
-            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__LN_CLASSES,
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, NsdPackage.NS__LN_CLASSES,
                     oldLNClasses, newLNClasses );
             if( msgs == null )
                 msgs = notification;
@@ -870,18 +869,18 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setLNClasses( TLNClasses newLNClasses ) {
+    public void setLNClasses( LNClasses newLNClasses ) {
         if( newLNClasses != lNClasses ) {
             NotificationChain msgs = null;
             if( lNClasses != null ) msgs = ( ( InternalEObject ) lNClasses ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__LN_CLASSES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__LN_CLASSES, null, msgs );
             if( newLNClasses != null ) msgs = ( ( InternalEObject ) newLNClasses ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TNS__LN_CLASSES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.NS__LN_CLASSES, null, msgs );
             msgs = basicSetLNClasses( newLNClasses, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__LN_CLASSES, newLNClasses, newLNClasses ) );
+                NsdPackage.NS__LN_CLASSES, newLNClasses, newLNClasses ) );
     }
 
     /**
@@ -904,7 +903,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         String oldDescID = descID;
         descID = newDescID;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__DESC_ID, oldDescID, descID ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__DESC_ID, oldDescID, descID ) );
     }
 
     /**
@@ -927,7 +926,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         String oldId = id;
         id = newId;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__ID, oldId, id ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__ID, oldId, id ) );
     }
 
     /**
@@ -936,7 +935,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public TPubStage getPublicationStage() {
+    public PubStage getPublicationStage() {
         return publicationStage;
     }
 
@@ -946,13 +945,13 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setPublicationStage( TPubStage newPublicationStage ) {
-        TPubStage oldPublicationStage = publicationStage;
+    public void setPublicationStage( PubStage newPublicationStage ) {
+        PubStage oldPublicationStage = publicationStage;
         publicationStage = newPublicationStage == null ? PUBLICATION_STAGE_EDEFAULT : newPublicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStageESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__PUBLICATION_STAGE, oldPublicationStage, publicationStage, !oldPublicationStageESet ) );
+                NsdPackage.NS__PUBLICATION_STAGE, oldPublicationStage, publicationStage, !oldPublicationStageESet ) );
     }
 
     /**
@@ -962,12 +961,12 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      */
     @Override
     public void unsetPublicationStage() {
-        TPubStage oldPublicationStage = publicationStage;
+        PubStage oldPublicationStage = publicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStage = PUBLICATION_STAGE_EDEFAULT;
         publicationStageESet = false;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TNS__PUBLICATION_STAGE,
+            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__PUBLICATION_STAGE,
                     oldPublicationStage, PUBLICATION_STAGE_EDEFAULT, oldPublicationStageESet ) );
     }
 
@@ -987,7 +986,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public short getRelease() {
+    public Integer getRelease() {
         return release;
     }
 
@@ -997,12 +996,12 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setRelease( short newRelease ) {
-        short oldRelease = release;
+    public void setRelease( Integer newRelease ) {
+        Integer oldRelease = release;
         release = newRelease;
         boolean oldReleaseESet = releaseESet;
         releaseESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__RELEASE,
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__RELEASE,
                 oldRelease, release, !oldReleaseESet ) );
     }
 
@@ -1013,11 +1012,11 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      */
     @Override
     public void unsetRelease() {
-        short oldRelease = release;
+        Integer oldRelease = release;
         boolean oldReleaseESet = releaseESet;
         release = RELEASE_EDEFAULT;
         releaseESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TNS__RELEASE,
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__RELEASE,
                 oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) );
     }
 
@@ -1052,7 +1051,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         revision = newRevision;
         boolean oldRevisionESet = revisionESet;
         revisionESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__REVISION,
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__REVISION,
                 oldRevision, revision, !oldRevisionESet ) );
     }
 
@@ -1067,8 +1066,8 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         boolean oldRevisionESet = revisionESet;
         revision = REVISION_EDEFAULT;
         revisionESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TNS__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__REVISION,
+                oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
     }
 
     /**
@@ -1101,7 +1100,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         XMLGregorianCalendar oldUmlDate = umlDate;
         umlDate = newUmlDate;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__UML_DATE, oldUmlDate, umlDate ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__UML_DATE, oldUmlDate, umlDate ) );
     }
 
     /**
@@ -1124,7 +1123,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         String oldUmlVersion = umlVersion;
         umlVersion = newUmlVersion;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TNS__UML_VERSION, oldUmlVersion, umlVersion ) );
+                NsdPackage.NS__UML_VERSION, oldUmlVersion, umlVersion ) );
     }
 
     /**
@@ -1133,7 +1132,7 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public int getVersion() {
+    public Integer getVersion() {
         return version;
     }
 
@@ -1143,12 +1142,12 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      * @generated
      */
     @Override
-    public void setVersion( int newVersion ) {
-        int oldVersion = version;
+    public void setVersion( Integer newVersion ) {
+        Integer oldVersion = version;
         version = newVersion;
         boolean oldVersionESet = versionESet;
         versionESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TNS__VERSION,
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__VERSION,
                 oldVersion, version, !oldVersionESet ) );
     }
 
@@ -1159,11 +1158,11 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
      */
     @Override
     public void unsetVersion() {
-        int oldVersion = version;
+        Integer oldVersion = version;
         boolean oldVersionESet = versionESet;
         version = VERSION_EDEFAULT;
         versionESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TNS__VERSION,
+        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__VERSION,
                 oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
     }
 
@@ -1185,25 +1184,25 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TNS__CHANGES:
+        case NsdPackage.NS__CHANGES:
             return basicSetChanges( null, msgs );
-        case NsdPackage.TNS__DEPENDS_ON:
+        case NsdPackage.NS__DEPENDS_ON:
             return basicSetDependsOn( null, msgs );
-        case NsdPackage.TNS__BASIC_TYPES:
+        case NsdPackage.NS__BASIC_TYPES:
             return basicSetBasicTypes( null, msgs );
-        case NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS:
+        case NsdPackage.NS__FUNCTIONAL_CONSTRAINTS:
             return basicSetFunctionalConstraints( null, msgs );
-        case NsdPackage.TNS__PRESENCE_CONDITIONS:
+        case NsdPackage.NS__PRESENCE_CONDITIONS:
             return basicSetPresenceConditions( null, msgs );
-        case NsdPackage.TNS__ABBREVIATIONS:
+        case NsdPackage.NS__ABBREVIATIONS:
             return basicSetAbbreviations( null, msgs );
-        case NsdPackage.TNS__ENUMERATIONS:
+        case NsdPackage.NS__ENUMERATIONS:
             return basicSetEnumerations( null, msgs );
-        case NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES:
+        case NsdPackage.NS__CONSTRUCTED_ATTRIBUTES:
             return basicSetConstructedAttributes( null, msgs );
-        case NsdPackage.TNS__CD_CS:
+        case NsdPackage.NS__CD_CS:
             return basicSetCDCs( null, msgs );
-        case NsdPackage.TNS__LN_CLASSES:
+        case NsdPackage.NS__LN_CLASSES:
             return basicSetLNClasses( null, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -1217,42 +1216,42 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TNS__CHANGES:
+        case NsdPackage.NS__RELEASE:
+            return getRelease();
+        case NsdPackage.NS__VERSION:
+            return getVersion();
+        case NsdPackage.NS__CHANGES:
             return getChanges();
-        case NsdPackage.TNS__DEPENDS_ON:
+        case NsdPackage.NS__DEPENDS_ON:
             return getDependsOn();
-        case NsdPackage.TNS__BASIC_TYPES:
+        case NsdPackage.NS__BASIC_TYPES:
             return getBasicTypes();
-        case NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS:
+        case NsdPackage.NS__FUNCTIONAL_CONSTRAINTS:
             return getFunctionalConstraints();
-        case NsdPackage.TNS__PRESENCE_CONDITIONS:
+        case NsdPackage.NS__PRESENCE_CONDITIONS:
             return getPresenceConditions();
-        case NsdPackage.TNS__ABBREVIATIONS:
+        case NsdPackage.NS__ABBREVIATIONS:
             return getAbbreviations();
-        case NsdPackage.TNS__ENUMERATIONS:
+        case NsdPackage.NS__ENUMERATIONS:
             return getEnumerations();
-        case NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES:
+        case NsdPackage.NS__CONSTRUCTED_ATTRIBUTES:
             return getConstructedAttributes();
-        case NsdPackage.TNS__CD_CS:
+        case NsdPackage.NS__CD_CS:
             return getCDCs();
-        case NsdPackage.TNS__LN_CLASSES:
+        case NsdPackage.NS__LN_CLASSES:
             return getLNClasses();
-        case NsdPackage.TNS__DESC_ID:
+        case NsdPackage.NS__DESC_ID:
             return getDescID();
-        case NsdPackage.TNS__ID:
+        case NsdPackage.NS__ID:
             return getId();
-        case NsdPackage.TNS__PUBLICATION_STAGE:
+        case NsdPackage.NS__PUBLICATION_STAGE:
             return getPublicationStage();
-        case NsdPackage.TNS__RELEASE:
-            return getRelease();
-        case NsdPackage.TNS__REVISION:
+        case NsdPackage.NS__REVISION:
             return getRevision();
-        case NsdPackage.TNS__UML_DATE:
+        case NsdPackage.NS__UML_DATE:
             return getUmlDate();
-        case NsdPackage.TNS__UML_VERSION:
+        case NsdPackage.NS__UML_VERSION:
             return getUmlVersion();
-        case NsdPackage.TNS__VERSION:
-            return getVersion();
         }
         return super.eGet( featureID, resolve, coreType );
     }
@@ -1265,60 +1264,60 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TNS__CHANGES:
-            setChanges( ( TChanges ) newValue );
+        case NsdPackage.NS__RELEASE:
+            setRelease( ( Integer ) newValue );
+            return;
+        case NsdPackage.NS__VERSION:
+            setVersion( ( Integer ) newValue );
+            return;
+        case NsdPackage.NS__CHANGES:
+            setChanges( ( Changes ) newValue );
             return;
-        case NsdPackage.TNS__DEPENDS_ON:
+        case NsdPackage.NS__DEPENDS_ON:
             setDependsOn( ( DependsOnType ) newValue );
             return;
-        case NsdPackage.TNS__BASIC_TYPES:
-            setBasicTypes( ( TBasicTypes ) newValue );
+        case NsdPackage.NS__BASIC_TYPES:
+            setBasicTypes( ( BasicTypes ) newValue );
             return;
-        case NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS:
-            setFunctionalConstraints( ( TFunctionalConstraints ) newValue );
+        case NsdPackage.NS__FUNCTIONAL_CONSTRAINTS:
+            setFunctionalConstraints( ( FunctionalConstraints ) newValue );
             return;
-        case NsdPackage.TNS__PRESENCE_CONDITIONS:
-            setPresenceConditions( ( TPresenceConditions ) newValue );
+        case NsdPackage.NS__PRESENCE_CONDITIONS:
+            setPresenceConditions( ( PresenceConditions ) newValue );
             return;
-        case NsdPackage.TNS__ABBREVIATIONS:
-            setAbbreviations( ( TAbbreviations ) newValue );
+        case NsdPackage.NS__ABBREVIATIONS:
+            setAbbreviations( ( Abbreviations ) newValue );
             return;
-        case NsdPackage.TNS__ENUMERATIONS:
-            setEnumerations( ( TEnumerations ) newValue );
+        case NsdPackage.NS__ENUMERATIONS:
+            setEnumerations( ( Enumerations ) newValue );
             return;
-        case NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES:
-            setConstructedAttributes( ( TConstructedAttributes ) newValue );
+        case NsdPackage.NS__CONSTRUCTED_ATTRIBUTES:
+            setConstructedAttributes( ( ConstructedAttributes ) newValue );
             return;
-        case NsdPackage.TNS__CD_CS:
-            setCDCs( ( TCDCs ) newValue );
+        case NsdPackage.NS__CD_CS:
+            setCDCs( ( CDCs ) newValue );
             return;
-        case NsdPackage.TNS__LN_CLASSES:
-            setLNClasses( ( TLNClasses ) newValue );
+        case NsdPackage.NS__LN_CLASSES:
+            setLNClasses( ( LNClasses ) newValue );
             return;
-        case NsdPackage.TNS__DESC_ID:
+        case NsdPackage.NS__DESC_ID:
             setDescID( ( String ) newValue );
             return;
-        case NsdPackage.TNS__ID:
+        case NsdPackage.NS__ID:
             setId( ( String ) newValue );
             return;
-        case NsdPackage.TNS__PUBLICATION_STAGE:
-            setPublicationStage( ( TPubStage ) newValue );
+        case NsdPackage.NS__PUBLICATION_STAGE:
+            setPublicationStage( ( PubStage ) newValue );
             return;
-        case NsdPackage.TNS__RELEASE:
-            setRelease( ( Short ) newValue );
-            return;
-        case NsdPackage.TNS__REVISION:
+        case NsdPackage.NS__REVISION:
             setRevision( ( String ) newValue );
             return;
-        case NsdPackage.TNS__UML_DATE:
+        case NsdPackage.NS__UML_DATE:
             setUmlDate( ( XMLGregorianCalendar ) newValue );
             return;
-        case NsdPackage.TNS__UML_VERSION:
+        case NsdPackage.NS__UML_VERSION:
             setUmlVersion( ( String ) newValue );
             return;
-        case NsdPackage.TNS__VERSION:
-            setVersion( ( Integer ) newValue );
-            return;
         }
         super.eSet( featureID, newValue );
     }
@@ -1331,60 +1330,60 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TNS__CHANGES:
-            setChanges( ( TChanges ) null );
+        case NsdPackage.NS__RELEASE:
+            unsetRelease();
+            return;
+        case NsdPackage.NS__VERSION:
+            unsetVersion();
+            return;
+        case NsdPackage.NS__CHANGES:
+            setChanges( ( Changes ) null );
             return;
-        case NsdPackage.TNS__DEPENDS_ON:
+        case NsdPackage.NS__DEPENDS_ON:
             setDependsOn( ( DependsOnType ) null );
             return;
-        case NsdPackage.TNS__BASIC_TYPES:
-            setBasicTypes( ( TBasicTypes ) null );
+        case NsdPackage.NS__BASIC_TYPES:
+            setBasicTypes( ( BasicTypes ) null );
             return;
-        case NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS:
-            setFunctionalConstraints( ( TFunctionalConstraints ) null );
+        case NsdPackage.NS__FUNCTIONAL_CONSTRAINTS:
+            setFunctionalConstraints( ( FunctionalConstraints ) null );
             return;
-        case NsdPackage.TNS__PRESENCE_CONDITIONS:
-            setPresenceConditions( ( TPresenceConditions ) null );
+        case NsdPackage.NS__PRESENCE_CONDITIONS:
+            setPresenceConditions( ( PresenceConditions ) null );
             return;
-        case NsdPackage.TNS__ABBREVIATIONS:
-            setAbbreviations( ( TAbbreviations ) null );
+        case NsdPackage.NS__ABBREVIATIONS:
+            setAbbreviations( ( Abbreviations ) null );
             return;
-        case NsdPackage.TNS__ENUMERATIONS:
-            setEnumerations( ( TEnumerations ) null );
+        case NsdPackage.NS__ENUMERATIONS:
+            setEnumerations( ( Enumerations ) null );
             return;
-        case NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES:
-            setConstructedAttributes( ( TConstructedAttributes ) null );
+        case NsdPackage.NS__CONSTRUCTED_ATTRIBUTES:
+            setConstructedAttributes( ( ConstructedAttributes ) null );
             return;
-        case NsdPackage.TNS__CD_CS:
-            setCDCs( ( TCDCs ) null );
+        case NsdPackage.NS__CD_CS:
+            setCDCs( ( CDCs ) null );
             return;
-        case NsdPackage.TNS__LN_CLASSES:
-            setLNClasses( ( TLNClasses ) null );
+        case NsdPackage.NS__LN_CLASSES:
+            setLNClasses( ( LNClasses ) null );
             return;
-        case NsdPackage.TNS__DESC_ID:
+        case NsdPackage.NS__DESC_ID:
             setDescID( DESC_ID_EDEFAULT );
             return;
-        case NsdPackage.TNS__ID:
+        case NsdPackage.NS__ID:
             setId( ID_EDEFAULT );
             return;
-        case NsdPackage.TNS__PUBLICATION_STAGE:
+        case NsdPackage.NS__PUBLICATION_STAGE:
             unsetPublicationStage();
             return;
-        case NsdPackage.TNS__RELEASE:
-            unsetRelease();
-            return;
-        case NsdPackage.TNS__REVISION:
+        case NsdPackage.NS__REVISION:
             unsetRevision();
             return;
-        case NsdPackage.TNS__UML_DATE:
+        case NsdPackage.NS__UML_DATE:
             setUmlDate( UML_DATE_EDEFAULT );
             return;
-        case NsdPackage.TNS__UML_VERSION:
+        case NsdPackage.NS__UML_VERSION:
             setUmlVersion( UML_VERSION_EDEFAULT );
             return;
-        case NsdPackage.TNS__VERSION:
-            unsetVersion();
-            return;
         }
         super.eUnset( featureID );
     }
@@ -1397,46 +1396,86 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TNS__CHANGES:
+        case NsdPackage.NS__RELEASE:
+            return isSetRelease();
+        case NsdPackage.NS__VERSION:
+            return isSetVersion();
+        case NsdPackage.NS__CHANGES:
             return changes != null;
-        case NsdPackage.TNS__DEPENDS_ON:
+        case NsdPackage.NS__DEPENDS_ON:
             return dependsOn != null;
-        case NsdPackage.TNS__BASIC_TYPES:
+        case NsdPackage.NS__BASIC_TYPES:
             return basicTypes != null;
-        case NsdPackage.TNS__FUNCTIONAL_CONSTRAINTS:
+        case NsdPackage.NS__FUNCTIONAL_CONSTRAINTS:
             return functionalConstraints != null;
-        case NsdPackage.TNS__PRESENCE_CONDITIONS:
+        case NsdPackage.NS__PRESENCE_CONDITIONS:
             return presenceConditions != null;
-        case NsdPackage.TNS__ABBREVIATIONS:
+        case NsdPackage.NS__ABBREVIATIONS:
             return abbreviations != null;
-        case NsdPackage.TNS__ENUMERATIONS:
+        case NsdPackage.NS__ENUMERATIONS:
             return enumerations != null;
-        case NsdPackage.TNS__CONSTRUCTED_ATTRIBUTES:
+        case NsdPackage.NS__CONSTRUCTED_ATTRIBUTES:
             return constructedAttributes != null;
-        case NsdPackage.TNS__CD_CS:
+        case NsdPackage.NS__CD_CS:
             return cDCs != null;
-        case NsdPackage.TNS__LN_CLASSES:
+        case NsdPackage.NS__LN_CLASSES:
             return lNClasses != null;
-        case NsdPackage.TNS__DESC_ID:
+        case NsdPackage.NS__DESC_ID:
             return DESC_ID_EDEFAULT == null ? descID != null : !DESC_ID_EDEFAULT.equals( descID );
-        case NsdPackage.TNS__ID:
+        case NsdPackage.NS__ID:
             return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals( id );
-        case NsdPackage.TNS__PUBLICATION_STAGE:
+        case NsdPackage.NS__PUBLICATION_STAGE:
             return isSetPublicationStage();
-        case NsdPackage.TNS__RELEASE:
-            return isSetRelease();
-        case NsdPackage.TNS__REVISION:
+        case NsdPackage.NS__REVISION:
             return isSetRevision();
-        case NsdPackage.TNS__UML_DATE:
+        case NsdPackage.NS__UML_DATE:
             return UML_DATE_EDEFAULT == null ? umlDate != null : !UML_DATE_EDEFAULT.equals( umlDate );
-        case NsdPackage.TNS__UML_VERSION:
+        case NsdPackage.NS__UML_VERSION:
             return UML_VERSION_EDEFAULT == null ? umlVersion != null : !UML_VERSION_EDEFAULT.equals( umlVersion );
-        case NsdPackage.TNS__VERSION:
-            return isSetVersion();
         }
         return super.eIsSet( featureID );
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == NSDObjectWithVersionAndRelease.class ) {
+            switch( derivedFeatureID ) {
+            case NsdPackage.NS__RELEASE:
+                return NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE;
+            case NsdPackage.NS__VERSION:
+                return NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION;
+            default:
+                return -1;
+            }
+        }
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == NSDObjectWithVersionAndRelease.class ) {
+            switch( baseFeatureID ) {
+            case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE:
+                return NsdPackage.NS__RELEASE;
+            case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION:
+                return NsdPackage.NS__VERSION;
+            default:
+                return -1;
+            }
+        }
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
+    }
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1447,7 +1486,17 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         if( eIsProxy() ) return super.toString();
 
         StringBuilder result = new StringBuilder( super.toString() );
-        result.append( " (descID: " );
+        result.append( " (release: " );
+        if( releaseESet )
+            result.append( release );
+        else
+            result.append( "<unset>" );
+        result.append( ", version: " );
+        if( versionESet )
+            result.append( version );
+        else
+            result.append( "<unset>" );
+        result.append( ", descID: " );
         result.append( descID );
         result.append( ", id: " );
         result.append( id );
@@ -1456,11 +1505,6 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
             result.append( publicationStage );
         else
             result.append( "<unset>" );
-        result.append( ", release: " );
-        if( releaseESet )
-            result.append( release );
-        else
-            result.append( "<unset>" );
         result.append( ", revision: " );
         if( revisionESet )
             result.append( revision );
@@ -1470,13 +1514,8 @@ public class TNSImpl extends TCopyrightedImpl implements TNS {
         result.append( umlDate );
         result.append( ", umlVersion: " );
         result.append( umlVersion );
-        result.append( ", version: " );
-        if( versionESet )
-            result.append( version );
-        else
-            result.append( "<unset>" );
         result.append( ')' );
         return result.toString();
     }
 
-} //TNSImpl
+} //NSImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TNoticeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NoticeImpl.java
similarity index 87%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TNoticeImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NoticeImpl.java
index 70620bf40827d3adef5c12af921fd02e7dafffc1..5b0f107e048708abed3d85aefea70a3f2d66dac9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TNoticeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NoticeImpl.java
@@ -19,8 +19,8 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -35,18 +35,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TNotice</b></em>'.
+ * An implementation of the model object '<em><b>Notice</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TNoticeImpl#getMixed <em>Mixed</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.NoticeImpl#getMixed <em>Mixed</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice {
+public class NoticeImpl extends MinimalEObjectImpl.Container implements Notice {
     /**
      * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
      * <!-- begin-user-doc -->
@@ -62,7 +62,7 @@ public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TNoticeImpl() {
+    protected NoticeImpl() {
         super();
     }
 
@@ -73,7 +73,7 @@ public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TNOTICE;
+        return NsdPackage.Literals.NOTICE;
     }
 
     /**
@@ -84,7 +84,7 @@ public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice
     @Override
     public FeatureMap getMixed() {
         if( mixed == null ) {
-            mixed = new BasicFeatureMap( this, NsdPackage.TNOTICE__MIXED );
+            mixed = new BasicFeatureMap( this, NsdPackage.NOTICE__MIXED );
         }
         return mixed;
     }
@@ -97,7 +97,7 @@ public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TNOTICE__MIXED:
+        case NsdPackage.NOTICE__MIXED:
             return ( ( InternalEList< ? > ) getMixed() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -111,7 +111,7 @@ public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TNOTICE__MIXED:
+        case NsdPackage.NOTICE__MIXED:
             if( coreType ) return getMixed();
             return ( ( FeatureMap.Internal ) getMixed() ).getWrapper();
         }
@@ -126,7 +126,7 @@ public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TNOTICE__MIXED:
+        case NsdPackage.NOTICE__MIXED:
             ( ( FeatureMap.Internal ) getMixed() ).set( newValue );
             return;
         }
@@ -141,7 +141,7 @@ public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TNOTICE__MIXED:
+        case NsdPackage.NOTICE__MIXED:
             getMixed().clear();
             return;
         }
@@ -156,7 +156,7 @@ public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TNOTICE__MIXED:
+        case NsdPackage.NOTICE__MIXED:
             return mixed != null && !mixed.isEmpty();
         }
         return super.eIsSet( featureID );
@@ -178,4 +178,4 @@ public class TNoticeImpl extends MinimalEObjectImpl.Container implements TNotice
         return result.toString();
     }
 
-} //TNoticeImpl
+} //NoticeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdFactoryImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdFactoryImpl.java
index 7210b74fbabc5c896f00845ad6b5adcae283f220..d46713b8420487e88645c1e3a7b7eec7b1f8fd8c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdFactoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdFactoryImpl.java
@@ -34,9 +34,6 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 import org.eclipse.emf.ecore.util.Diagnostician;
 
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
@@ -89,96 +86,96 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
             return createDocumentRoot();
         case NsdPackage.SERVICE_TYPE:
             return createServiceType();
-        case NsdPackage.TABBREVIATION:
-            return createTAbbreviation();
-        case NsdPackage.TABBREVIATIONS:
-            return createTAbbreviations();
-        case NsdPackage.TABSTRACT_LN_CLASS:
-            return createTAbstractLNClass();
-        case NsdPackage.TAPPLICABLE_SERVICE_NS:
-            return createTApplicableServiceNS();
-        case NsdPackage.TAPPLICABLE_SERVICES:
-            return createTApplicableServices();
-        case NsdPackage.TBASIC_TYPE:
-            return createTBasicType();
-        case NsdPackage.TBASIC_TYPES:
-            return createTBasicTypes();
-        case NsdPackage.TCDC:
-            return createTCDC();
-        case NsdPackage.TCD_CS:
-            return createTCDCs();
-        case NsdPackage.TCHANGES:
-            return createTChanges();
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE:
-            return createTConstructedAttribute();
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTES:
-            return createTConstructedAttributes();
-        case NsdPackage.TCOPYRIGHTED:
-            return createTCopyrighted();
-        case NsdPackage.TCOPYRIGHT_NOTICE:
-            return createTCopyrightNotice();
-        case NsdPackage.TDATA_ATTRIBUTE:
-            return createTDataAttribute();
-        case NsdPackage.TDATA_OBJECT:
-            return createTDataObject();
-        case NsdPackage.TDATA_SET_MEMBER_OF:
-            return createTDataSetMemberOf();
-        case NsdPackage.TDOC:
-            return createTDoc();
-        case NsdPackage.TDOCUMENTED_CLASS:
-            return createTDocumentedClass();
-        case NsdPackage.TENUMERATION:
-            return createTEnumeration();
-        case NsdPackage.TENUMERATIONS:
-            return createTEnumerations();
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT:
-            return createTFunctionalConstraint();
-        case NsdPackage.TFUNCTIONAL_CONSTRAINTS:
-            return createTFunctionalConstraints();
-        case NsdPackage.TLICENSE:
-            return createTLicense();
-        case NsdPackage.TLITERAL:
-            return createTLiteral();
-        case NsdPackage.TLN_CLASS:
-            return createTLNClass();
-        case NsdPackage.TLN_CLASSES:
-            return createTLNClasses();
-        case NsdPackage.TNOTICE:
-            return createTNotice();
-        case NsdPackage.TNS:
-            return createTNS();
-        case NsdPackage.TNS_DOC:
-            return createTNSDoc();
-        case NsdPackage.TPRESENCE_CONDITION:
-            return createTPresenceCondition();
-        case NsdPackage.TPRESENCE_CONDITIONS:
-            return createTPresenceConditions();
-        case NsdPackage.TSERVICE_CDC:
-            return createTServiceCDC();
-        case NsdPackage.TSERVICE_CD_CS:
-            return createTServiceCDCs();
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE:
-            return createTServiceConstructedAttribute();
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES:
-            return createTServiceConstructedAttributes();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE:
-            return createTServiceDataAttribute();
-        case NsdPackage.TSERVICE_NS:
-            return createTServiceNS();
-        case NsdPackage.TSERVICE_NS_USAGE:
-            return createTServiceNsUsage();
-        case NsdPackage.TSERVICE_PARAMETER:
-            return createTServiceParameter();
-        case NsdPackage.TSERVICE_TYPE_REALIZATION:
-            return createTServiceTypeRealization();
-        case NsdPackage.TSERVICE_TYPE_REALIZATIONS:
-            return createTServiceTypeRealizations();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE:
-            return createTSubDataAttribute();
-        case NsdPackage.TSUB_DATA_OBJECT:
-            return createTSubDataObject();
-        case NsdPackage.TTITLED_CLASS:
-            return createTTitledClass();
+        case NsdPackage.ABBREVIATION:
+            return createAbbreviation();
+        case NsdPackage.ABBREVIATIONS:
+            return createAbbreviations();
+        case NsdPackage.ABSTRACT_LN_CLASS:
+            return createAbstractLNClass();
+        case NsdPackage.APPLICABLE_SERVICE_NS:
+            return createApplicableServiceNS();
+        case NsdPackage.APPLICABLE_SERVICES:
+            return createApplicableServices();
+        case NsdPackage.BASIC_TYPE:
+            return createBasicType();
+        case NsdPackage.BASIC_TYPES:
+            return createBasicTypes();
+        case NsdPackage.CDC:
+            return createCDC();
+        case NsdPackage.CD_CS:
+            return createCDCs();
+        case NsdPackage.CHANGES:
+            return createChanges();
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE:
+            return createConstructedAttribute();
+        case NsdPackage.CONSTRUCTED_ATTRIBUTES:
+            return createConstructedAttributes();
+        case NsdPackage.COPYRIGHTED:
+            return createCopyrighted();
+        case NsdPackage.COPYRIGHT_NOTICE:
+            return createCopyrightNotice();
+        case NsdPackage.DATA_ATTRIBUTE:
+            return createDataAttribute();
+        case NsdPackage.DATA_OBJECT:
+            return createDataObject();
+        case NsdPackage.DATA_SET_MEMBER_OF:
+            return createDataSetMemberOf();
+        case NsdPackage.DOC:
+            return createDoc();
+        case NsdPackage.DOCUMENTED_CLASS:
+            return createDocumentedClass();
+        case NsdPackage.ENUMERATION:
+            return createEnumeration();
+        case NsdPackage.ENUMERATIONS:
+            return createEnumerations();
+        case NsdPackage.FUNCTIONAL_CONSTRAINT:
+            return createFunctionalConstraint();
+        case NsdPackage.FUNCTIONAL_CONSTRAINTS:
+            return createFunctionalConstraints();
+        case NsdPackage.LICENSE:
+            return createLicense();
+        case NsdPackage.LITERAL:
+            return createLiteral();
+        case NsdPackage.LN_CLASS:
+            return createLNClass();
+        case NsdPackage.LN_CLASSES:
+            return createLNClasses();
+        case NsdPackage.NOTICE:
+            return createNotice();
+        case NsdPackage.NS:
+            return createNS();
+        case NsdPackage.NS_DOC:
+            return createNSDoc();
+        case NsdPackage.PRESENCE_CONDITION:
+            return createPresenceCondition();
+        case NsdPackage.PRESENCE_CONDITIONS:
+            return createPresenceConditions();
+        case NsdPackage.SERVICE_CDC:
+            return createServiceCDC();
+        case NsdPackage.SERVICE_CD_CS:
+            return createServiceCDCs();
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE:
+            return createServiceConstructedAttribute();
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES:
+            return createServiceConstructedAttributes();
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE:
+            return createServiceDataAttribute();
+        case NsdPackage.SERVICE_NS:
+            return createServiceNS();
+        case NsdPackage.SERVICE_NS_USAGE:
+            return createServiceNsUsage();
+        case NsdPackage.SERVICE_PARAMETER:
+            return createServiceParameter();
+        case NsdPackage.SERVICE_TYPE_REALIZATION:
+            return createServiceTypeRealization();
+        case NsdPackage.SERVICE_TYPE_REALIZATIONS:
+            return createServiceTypeRealizations();
+        case NsdPackage.SUB_DATA_ATTRIBUTE:
+            return createSubDataAttribute();
+        case NsdPackage.SUB_DATA_OBJECT:
+            return createSubDataObject();
+        case NsdPackage.TITLED_CLASS:
+            return createTitledClass();
         default:
             throw new IllegalArgumentException( "The class '" + eClass.getName() + "' is not a valid classifier" );
         }
@@ -192,80 +189,32 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
     @Override
     public Object createFromString( EDataType eDataType, String initialValue ) {
         switch( eDataType.getClassifierID() ) {
-        case NsdPackage.TACSI_SERVICES_KIND:
-            return createTACSIServicesKindFromString( eDataType, initialValue );
-        case NsdPackage.TCB_KIND:
-            return createTCBKindFromString( eDataType, initialValue );
-        case NsdPackage.TDEFINED_ATTRIBUTE_TYPE_KIND:
-            return createTDefinedAttributeTypeKindFromString( eDataType, initialValue );
-        case NsdPackage.TLICENSE_KIND:
-            return createTLicenseKindFromString( eDataType, initialValue );
-        case NsdPackage.TPUB_STAGE:
-            return createTPubStageFromString( eDataType, initialValue );
-        case NsdPackage.TUNDEFINED_ATTRIBUTE_TYPE_KIND:
-            return createTUndefinedAttributeTypeKindFromString( eDataType, initialValue );
-        case NsdPackage.TABBREVIATION_NAME:
-            return createTAbbreviationNameFromString( eDataType, initialValue );
-        case NsdPackage.TABSTRACT_LN_CLASS_NAME:
-            return createTAbstractLNClassNameFromString( eDataType, initialValue );
-        case NsdPackage.TACSI_SERVICES_KIND_OBJECT:
-            return createTACSIServicesKindObjectFromString( eDataType, initialValue );
-        case NsdPackage.TATTRIBUTE_NAME:
-            return createTAttributeNameFromString( eDataType, initialValue );
-        case NsdPackage.TATTRIBUTE_TYPE_KIND:
-            return createTAttributeTypeKindFromString( eDataType, initialValue );
-        case NsdPackage.TBASIC_TYPE_NAME:
-            return createTBasicTypeNameFromString( eDataType, initialValue );
-        case NsdPackage.TCB_KIND_OBJECT:
-            return createTCBKindObjectFromString( eDataType, initialValue );
-        case NsdPackage.TCDC_NAME:
-            return createTCDCNameFromString( eDataType, initialValue );
-        case NsdPackage.TDATA_OBJECT_NAME:
-            return createTDataObjectNameFromString( eDataType, initialValue );
-        case NsdPackage.TDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
-            return createTDefinedAttributeTypeKindObjectFromString( eDataType, initialValue );
-        case NsdPackage.TDOC_ID:
-            return createTDocIDFromString( eDataType, initialValue );
-        case NsdPackage.TEMPTY_STRING:
-            return createTEmptyStringFromString( eDataType, initialValue );
-        case NsdPackage.TFC_ABBREVIATION:
-            return createTFCAbbreviationFromString( eDataType, initialValue );
-        case NsdPackage.TIEC61850_NAME:
-            return createTIec61850NameFromString( eDataType, initialValue );
-        case NsdPackage.TIEC61850_NAME_STRING:
-            return createTIec61850NameStringFromString( eDataType, initialValue );
-        case NsdPackage.TISSUES_TYPE:
-            return createTissuesTypeFromString( eDataType, initialValue );
-        case NsdPackage.TLICENSE_KIND_OBJECT:
-            return createTLicenseKindObjectFromString( eDataType, initialValue );
-        case NsdPackage.TLITERAL_NAME:
-            return createTLiteralNameFromString( eDataType, initialValue );
-        case NsdPackage.TLN_CLASS_NAME:
-            return createTLNClassNameFromString( eDataType, initialValue );
-        case NsdPackage.TNS_IDENTIFIER:
-            return createTNSIdentifierFromString( eDataType, initialValue );
-        case NsdPackage.TNS_RELEASE:
-            return createTNSReleaseFromString( eDataType, initialValue );
-        case NsdPackage.TNS_RELEASE_OBJECT:
-            return createTNSReleaseObjectFromString( eDataType, initialValue );
-        case NsdPackage.TNS_REVISION:
-            return createTNSRevisionFromString( eDataType, initialValue );
-        case NsdPackage.TNS_VERSION:
-            return createTNSVersionFromString( eDataType, initialValue );
-        case NsdPackage.TNS_VERSION_OBJECT:
-            return createTNSVersionObjectFromString( eDataType, initialValue );
-        case NsdPackage.TPRESENCE_CONDITION_ARGUMENT:
-            return createTPresenceConditionArgumentFromString( eDataType, initialValue );
-        case NsdPackage.TPRESENCE_CONDITION_NAME:
-            return createTPresenceConditionNameFromString( eDataType, initialValue );
-        case NsdPackage.TPUB_STAGE_OBJECT:
-            return createTPubStageObjectFromString( eDataType, initialValue );
-        case NsdPackage.TSUB_DATA_OBJECT_NAME:
-            return createTSubDataObjectNameFromString( eDataType, initialValue );
-        case NsdPackage.TUML_VERSION:
-            return createTUMLVersionFromString( eDataType, initialValue );
-        case NsdPackage.TUNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
-            return createTUndefinedAttributeTypeKindObjectFromString( eDataType, initialValue );
+        case NsdPackage.ACSI_SERVICES_KIND:
+            return createACSIServicesKindFromString( eDataType, initialValue );
+        case NsdPackage.CB_KIND:
+            return createCBKindFromString( eDataType, initialValue );
+        case NsdPackage.DEFINED_ATTRIBUTE_TYPE_KIND:
+            return createDefinedAttributeTypeKindFromString( eDataType, initialValue );
+        case NsdPackage.LICENSE_KIND:
+            return createLicenseKindFromString( eDataType, initialValue );
+        case NsdPackage.PUB_STAGE:
+            return createPubStageFromString( eDataType, initialValue );
+        case NsdPackage.UNDEFINED_ATTRIBUTE_TYPE_KIND:
+            return createUndefinedAttributeTypeKindFromString( eDataType, initialValue );
+        case NsdPackage.ACSI_SERVICES_KIND_OBJECT:
+            return createACSIServicesKindObjectFromString( eDataType, initialValue );
+        case NsdPackage.ATTRIBUTE_TYPE_KIND:
+            return createAttributeTypeKindFromString( eDataType, initialValue );
+        case NsdPackage.CB_KIND_OBJECT:
+            return createCBKindObjectFromString( eDataType, initialValue );
+        case NsdPackage.DEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
+            return createDefinedAttributeTypeKindObjectFromString( eDataType, initialValue );
+        case NsdPackage.LICENSE_KIND_OBJECT:
+            return createLicenseKindObjectFromString( eDataType, initialValue );
+        case NsdPackage.PUB_STAGE_OBJECT:
+            return createPubStageObjectFromString( eDataType, initialValue );
+        case NsdPackage.UNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
+            return createUndefinedAttributeTypeKindObjectFromString( eDataType, initialValue );
         default:
             throw new IllegalArgumentException(
                     "The datatype '" + eDataType.getName() + "' is not a valid classifier" );
@@ -280,80 +229,32 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
     @Override
     public String convertToString( EDataType eDataType, Object instanceValue ) {
         switch( eDataType.getClassifierID() ) {
-        case NsdPackage.TACSI_SERVICES_KIND:
-            return convertTACSIServicesKindToString( eDataType, instanceValue );
-        case NsdPackage.TCB_KIND:
-            return convertTCBKindToString( eDataType, instanceValue );
-        case NsdPackage.TDEFINED_ATTRIBUTE_TYPE_KIND:
-            return convertTDefinedAttributeTypeKindToString( eDataType, instanceValue );
-        case NsdPackage.TLICENSE_KIND:
-            return convertTLicenseKindToString( eDataType, instanceValue );
-        case NsdPackage.TPUB_STAGE:
-            return convertTPubStageToString( eDataType, instanceValue );
-        case NsdPackage.TUNDEFINED_ATTRIBUTE_TYPE_KIND:
-            return convertTUndefinedAttributeTypeKindToString( eDataType, instanceValue );
-        case NsdPackage.TABBREVIATION_NAME:
-            return convertTAbbreviationNameToString( eDataType, instanceValue );
-        case NsdPackage.TABSTRACT_LN_CLASS_NAME:
-            return convertTAbstractLNClassNameToString( eDataType, instanceValue );
-        case NsdPackage.TACSI_SERVICES_KIND_OBJECT:
-            return convertTACSIServicesKindObjectToString( eDataType, instanceValue );
-        case NsdPackage.TATTRIBUTE_NAME:
-            return convertTAttributeNameToString( eDataType, instanceValue );
-        case NsdPackage.TATTRIBUTE_TYPE_KIND:
-            return convertTAttributeTypeKindToString( eDataType, instanceValue );
-        case NsdPackage.TBASIC_TYPE_NAME:
-            return convertTBasicTypeNameToString( eDataType, instanceValue );
-        case NsdPackage.TCB_KIND_OBJECT:
-            return convertTCBKindObjectToString( eDataType, instanceValue );
-        case NsdPackage.TCDC_NAME:
-            return convertTCDCNameToString( eDataType, instanceValue );
-        case NsdPackage.TDATA_OBJECT_NAME:
-            return convertTDataObjectNameToString( eDataType, instanceValue );
-        case NsdPackage.TDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
-            return convertTDefinedAttributeTypeKindObjectToString( eDataType, instanceValue );
-        case NsdPackage.TDOC_ID:
-            return convertTDocIDToString( eDataType, instanceValue );
-        case NsdPackage.TEMPTY_STRING:
-            return convertTEmptyStringToString( eDataType, instanceValue );
-        case NsdPackage.TFC_ABBREVIATION:
-            return convertTFCAbbreviationToString( eDataType, instanceValue );
-        case NsdPackage.TIEC61850_NAME:
-            return convertTIec61850NameToString( eDataType, instanceValue );
-        case NsdPackage.TIEC61850_NAME_STRING:
-            return convertTIec61850NameStringToString( eDataType, instanceValue );
-        case NsdPackage.TISSUES_TYPE:
-            return convertTissuesTypeToString( eDataType, instanceValue );
-        case NsdPackage.TLICENSE_KIND_OBJECT:
-            return convertTLicenseKindObjectToString( eDataType, instanceValue );
-        case NsdPackage.TLITERAL_NAME:
-            return convertTLiteralNameToString( eDataType, instanceValue );
-        case NsdPackage.TLN_CLASS_NAME:
-            return convertTLNClassNameToString( eDataType, instanceValue );
-        case NsdPackage.TNS_IDENTIFIER:
-            return convertTNSIdentifierToString( eDataType, instanceValue );
-        case NsdPackage.TNS_RELEASE:
-            return convertTNSReleaseToString( eDataType, instanceValue );
-        case NsdPackage.TNS_RELEASE_OBJECT:
-            return convertTNSReleaseObjectToString( eDataType, instanceValue );
-        case NsdPackage.TNS_REVISION:
-            return convertTNSRevisionToString( eDataType, instanceValue );
-        case NsdPackage.TNS_VERSION:
-            return convertTNSVersionToString( eDataType, instanceValue );
-        case NsdPackage.TNS_VERSION_OBJECT:
-            return convertTNSVersionObjectToString( eDataType, instanceValue );
-        case NsdPackage.TPRESENCE_CONDITION_ARGUMENT:
-            return convertTPresenceConditionArgumentToString( eDataType, instanceValue );
-        case NsdPackage.TPRESENCE_CONDITION_NAME:
-            return convertTPresenceConditionNameToString( eDataType, instanceValue );
-        case NsdPackage.TPUB_STAGE_OBJECT:
-            return convertTPubStageObjectToString( eDataType, instanceValue );
-        case NsdPackage.TSUB_DATA_OBJECT_NAME:
-            return convertTSubDataObjectNameToString( eDataType, instanceValue );
-        case NsdPackage.TUML_VERSION:
-            return convertTUMLVersionToString( eDataType, instanceValue );
-        case NsdPackage.TUNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
-            return convertTUndefinedAttributeTypeKindObjectToString( eDataType, instanceValue );
+        case NsdPackage.ACSI_SERVICES_KIND:
+            return convertACSIServicesKindToString( eDataType, instanceValue );
+        case NsdPackage.CB_KIND:
+            return convertCBKindToString( eDataType, instanceValue );
+        case NsdPackage.DEFINED_ATTRIBUTE_TYPE_KIND:
+            return convertDefinedAttributeTypeKindToString( eDataType, instanceValue );
+        case NsdPackage.LICENSE_KIND:
+            return convertLicenseKindToString( eDataType, instanceValue );
+        case NsdPackage.PUB_STAGE:
+            return convertPubStageToString( eDataType, instanceValue );
+        case NsdPackage.UNDEFINED_ATTRIBUTE_TYPE_KIND:
+            return convertUndefinedAttributeTypeKindToString( eDataType, instanceValue );
+        case NsdPackage.ACSI_SERVICES_KIND_OBJECT:
+            return convertACSIServicesKindObjectToString( eDataType, instanceValue );
+        case NsdPackage.ATTRIBUTE_TYPE_KIND:
+            return convertAttributeTypeKindToString( eDataType, instanceValue );
+        case NsdPackage.CB_KIND_OBJECT:
+            return convertCBKindObjectToString( eDataType, instanceValue );
+        case NsdPackage.DEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
+            return convertDefinedAttributeTypeKindObjectToString( eDataType, instanceValue );
+        case NsdPackage.LICENSE_KIND_OBJECT:
+            return convertLicenseKindObjectToString( eDataType, instanceValue );
+        case NsdPackage.PUB_STAGE_OBJECT:
+            return convertPubStageObjectToString( eDataType, instanceValue );
+        case NsdPackage.UNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
+            return convertUndefinedAttributeTypeKindObjectToString( eDataType, instanceValue );
         default:
             throw new IllegalArgumentException(
                     "The datatype '" + eDataType.getName() + "' is not a valid classifier" );
@@ -410,9 +311,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TAbbreviation createTAbbreviation() {
-        TAbbreviationImpl tAbbreviation = new TAbbreviationImpl();
-        return tAbbreviation;
+    public Abbreviation createAbbreviation() {
+        AbbreviationImpl abbreviation = new AbbreviationImpl();
+        return abbreviation;
     }
 
     /**
@@ -421,9 +322,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TAbbreviations createTAbbreviations() {
-        TAbbreviationsImpl tAbbreviations = new TAbbreviationsImpl();
-        return tAbbreviations;
+    public Abbreviations createAbbreviations() {
+        AbbreviationsImpl abbreviations = new AbbreviationsImpl();
+        return abbreviations;
     }
 
     /**
@@ -432,9 +333,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TAbstractLNClass createTAbstractLNClass() {
-        TAbstractLNClassImpl tAbstractLNClass = new TAbstractLNClassImpl();
-        return tAbstractLNClass;
+    public AbstractLNClass createAbstractLNClass() {
+        AbstractLNClassImpl abstractLNClass = new AbstractLNClassImpl();
+        return abstractLNClass;
     }
 
     /**
@@ -443,9 +344,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TApplicableServiceNS createTApplicableServiceNS() {
-        TApplicableServiceNSImpl tApplicableServiceNS = new TApplicableServiceNSImpl();
-        return tApplicableServiceNS;
+    public ApplicableServiceNS createApplicableServiceNS() {
+        ApplicableServiceNSImpl applicableServiceNS = new ApplicableServiceNSImpl();
+        return applicableServiceNS;
     }
 
     /**
@@ -454,9 +355,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TApplicableServices createTApplicableServices() {
-        TApplicableServicesImpl tApplicableServices = new TApplicableServicesImpl();
-        return tApplicableServices;
+    public ApplicableServices createApplicableServices() {
+        ApplicableServicesImpl applicableServices = new ApplicableServicesImpl();
+        return applicableServices;
     }
 
     /**
@@ -465,9 +366,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TBasicType createTBasicType() {
-        TBasicTypeImpl tBasicType = new TBasicTypeImpl();
-        return tBasicType;
+    public BasicType createBasicType() {
+        BasicTypeImpl basicType = new BasicTypeImpl();
+        return basicType;
     }
 
     /**
@@ -476,9 +377,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TBasicTypes createTBasicTypes() {
-        TBasicTypesImpl tBasicTypes = new TBasicTypesImpl();
-        return tBasicTypes;
+    public BasicTypes createBasicTypes() {
+        BasicTypesImpl basicTypes = new BasicTypesImpl();
+        return basicTypes;
     }
 
     /**
@@ -487,9 +388,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TCDC createTCDC() {
-        TCDCImpl tcdc = new TCDCImpl();
-        return tcdc;
+    public CDC createCDC() {
+        CDCImpl cdc = new CDCImpl();
+        return cdc;
     }
 
     /**
@@ -498,9 +399,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TCDCs createTCDCs() {
-        TCDCsImpl tcdCs = new TCDCsImpl();
-        return tcdCs;
+    public CDCs createCDCs() {
+        CDCsImpl cdCs = new CDCsImpl();
+        return cdCs;
     }
 
     /**
@@ -509,9 +410,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TChanges createTChanges() {
-        TChangesImpl tChanges = new TChangesImpl();
-        return tChanges;
+    public Changes createChanges() {
+        ChangesImpl changes = new ChangesImpl();
+        return changes;
     }
 
     /**
@@ -520,9 +421,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TConstructedAttribute createTConstructedAttribute() {
-        TConstructedAttributeImpl tConstructedAttribute = new TConstructedAttributeImpl();
-        return tConstructedAttribute;
+    public ConstructedAttribute createConstructedAttribute() {
+        ConstructedAttributeImpl constructedAttribute = new ConstructedAttributeImpl();
+        return constructedAttribute;
     }
 
     /**
@@ -531,9 +432,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TConstructedAttributes createTConstructedAttributes() {
-        TConstructedAttributesImpl tConstructedAttributes = new TConstructedAttributesImpl();
-        return tConstructedAttributes;
+    public ConstructedAttributes createConstructedAttributes() {
+        ConstructedAttributesImpl constructedAttributes = new ConstructedAttributesImpl();
+        return constructedAttributes;
     }
 
     /**
@@ -542,9 +443,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TCopyrighted createTCopyrighted() {
-        TCopyrightedImpl tCopyrighted = new TCopyrightedImpl();
-        return tCopyrighted;
+    public Copyrighted createCopyrighted() {
+        CopyrightedImpl copyrighted = new CopyrightedImpl();
+        return copyrighted;
     }
 
     /**
@@ -553,9 +454,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TCopyrightNotice createTCopyrightNotice() {
-        TCopyrightNoticeImpl tCopyrightNotice = new TCopyrightNoticeImpl();
-        return tCopyrightNotice;
+    public CopyrightNotice createCopyrightNotice() {
+        CopyrightNoticeImpl copyrightNotice = new CopyrightNoticeImpl();
+        return copyrightNotice;
     }
 
     /**
@@ -564,9 +465,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TDataAttribute createTDataAttribute() {
-        TDataAttributeImpl tDataAttribute = new TDataAttributeImpl();
-        return tDataAttribute;
+    public DataAttribute createDataAttribute() {
+        DataAttributeImpl dataAttribute = new DataAttributeImpl();
+        return dataAttribute;
     }
 
     /**
@@ -575,9 +476,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TDataObject createTDataObject() {
-        TDataObjectImpl tDataObject = new TDataObjectImpl();
-        return tDataObject;
+    public DataObject createDataObject() {
+        DataObjectImpl dataObject = new DataObjectImpl();
+        return dataObject;
     }
 
     /**
@@ -586,9 +487,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TDataSetMemberOf createTDataSetMemberOf() {
-        TDataSetMemberOfImpl tDataSetMemberOf = new TDataSetMemberOfImpl();
-        return tDataSetMemberOf;
+    public DataSetMemberOf createDataSetMemberOf() {
+        DataSetMemberOfImpl dataSetMemberOf = new DataSetMemberOfImpl();
+        return dataSetMemberOf;
     }
 
     /**
@@ -597,9 +498,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TDoc createTDoc() {
-        TDocImpl tDoc = new TDocImpl();
-        return tDoc;
+    public Doc createDoc() {
+        DocImpl doc = new DocImpl();
+        return doc;
     }
 
     /**
@@ -608,9 +509,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TDocumentedClass createTDocumentedClass() {
-        TDocumentedClassImpl tDocumentedClass = new TDocumentedClassImpl();
-        return tDocumentedClass;
+    public DocumentedClass createDocumentedClass() {
+        DocumentedClassImpl documentedClass = new DocumentedClassImpl();
+        return documentedClass;
     }
 
     /**
@@ -619,9 +520,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TEnumeration createTEnumeration() {
-        TEnumerationImpl tEnumeration = new TEnumerationImpl();
-        return tEnumeration;
+    public Enumeration createEnumeration() {
+        EnumerationImpl enumeration = new EnumerationImpl();
+        return enumeration;
     }
 
     /**
@@ -630,9 +531,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TEnumerations createTEnumerations() {
-        TEnumerationsImpl tEnumerations = new TEnumerationsImpl();
-        return tEnumerations;
+    public Enumerations createEnumerations() {
+        EnumerationsImpl enumerations = new EnumerationsImpl();
+        return enumerations;
     }
 
     /**
@@ -641,9 +542,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TFunctionalConstraint createTFunctionalConstraint() {
-        TFunctionalConstraintImpl tFunctionalConstraint = new TFunctionalConstraintImpl();
-        return tFunctionalConstraint;
+    public FunctionalConstraint createFunctionalConstraint() {
+        FunctionalConstraintImpl functionalConstraint = new FunctionalConstraintImpl();
+        return functionalConstraint;
     }
 
     /**
@@ -652,9 +553,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TFunctionalConstraints createTFunctionalConstraints() {
-        TFunctionalConstraintsImpl tFunctionalConstraints = new TFunctionalConstraintsImpl();
-        return tFunctionalConstraints;
+    public FunctionalConstraints createFunctionalConstraints() {
+        FunctionalConstraintsImpl functionalConstraints = new FunctionalConstraintsImpl();
+        return functionalConstraints;
     }
 
     /**
@@ -663,9 +564,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TLicense createTLicense() {
-        TLicenseImpl tLicense = new TLicenseImpl();
-        return tLicense;
+    public License createLicense() {
+        LicenseImpl license = new LicenseImpl();
+        return license;
     }
 
     /**
@@ -674,9 +575,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TLiteral createTLiteral() {
-        TLiteralImpl tLiteral = new TLiteralImpl();
-        return tLiteral;
+    public Literal createLiteral() {
+        LiteralImpl literal = new LiteralImpl();
+        return literal;
     }
 
     /**
@@ -685,9 +586,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TLNClass createTLNClass() {
-        TLNClassImpl tlnClass = new TLNClassImpl();
-        return tlnClass;
+    public LNClass createLNClass() {
+        LNClassImpl lnClass = new LNClassImpl();
+        return lnClass;
     }
 
     /**
@@ -696,9 +597,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TLNClasses createTLNClasses() {
-        TLNClassesImpl tlnClasses = new TLNClassesImpl();
-        return tlnClasses;
+    public LNClasses createLNClasses() {
+        LNClassesImpl lnClasses = new LNClassesImpl();
+        return lnClasses;
     }
 
     /**
@@ -707,9 +608,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TNotice createTNotice() {
-        TNoticeImpl tNotice = new TNoticeImpl();
-        return tNotice;
+    public Notice createNotice() {
+        NoticeImpl notice = new NoticeImpl();
+        return notice;
     }
 
     /**
@@ -718,9 +619,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TNS createTNS() {
-        TNSImpl tns = new TNSImpl();
-        return tns;
+    public NS createNS() {
+        NSImpl ns = new NSImpl();
+        return ns;
     }
 
     /**
@@ -729,9 +630,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TNSDoc createTNSDoc() {
-        TNSDocImpl tnsDoc = new TNSDocImpl();
-        return tnsDoc;
+    public NSDoc createNSDoc() {
+        NSDocImpl nsDoc = new NSDocImpl();
+        return nsDoc;
     }
 
     /**
@@ -740,9 +641,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TPresenceCondition createTPresenceCondition() {
-        TPresenceConditionImpl tPresenceCondition = new TPresenceConditionImpl();
-        return tPresenceCondition;
+    public PresenceCondition createPresenceCondition() {
+        PresenceConditionImpl presenceCondition = new PresenceConditionImpl();
+        return presenceCondition;
     }
 
     /**
@@ -751,9 +652,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TPresenceConditions createTPresenceConditions() {
-        TPresenceConditionsImpl tPresenceConditions = new TPresenceConditionsImpl();
-        return tPresenceConditions;
+    public PresenceConditions createPresenceConditions() {
+        PresenceConditionsImpl presenceConditions = new PresenceConditionsImpl();
+        return presenceConditions;
     }
 
     /**
@@ -762,9 +663,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceCDC createTServiceCDC() {
-        TServiceCDCImpl tServiceCDC = new TServiceCDCImpl();
-        return tServiceCDC;
+    public ServiceCDC createServiceCDC() {
+        ServiceCDCImpl serviceCDC = new ServiceCDCImpl();
+        return serviceCDC;
     }
 
     /**
@@ -773,9 +674,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceCDCs createTServiceCDCs() {
-        TServiceCDCsImpl tServiceCDCs = new TServiceCDCsImpl();
-        return tServiceCDCs;
+    public ServiceCDCs createServiceCDCs() {
+        ServiceCDCsImpl serviceCDCs = new ServiceCDCsImpl();
+        return serviceCDCs;
     }
 
     /**
@@ -784,9 +685,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceConstructedAttribute createTServiceConstructedAttribute() {
-        TServiceConstructedAttributeImpl tServiceConstructedAttribute = new TServiceConstructedAttributeImpl();
-        return tServiceConstructedAttribute;
+    public ServiceConstructedAttribute createServiceConstructedAttribute() {
+        ServiceConstructedAttributeImpl serviceConstructedAttribute = new ServiceConstructedAttributeImpl();
+        return serviceConstructedAttribute;
     }
 
     /**
@@ -795,9 +696,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceConstructedAttributes createTServiceConstructedAttributes() {
-        TServiceConstructedAttributesImpl tServiceConstructedAttributes = new TServiceConstructedAttributesImpl();
-        return tServiceConstructedAttributes;
+    public ServiceConstructedAttributes createServiceConstructedAttributes() {
+        ServiceConstructedAttributesImpl serviceConstructedAttributes = new ServiceConstructedAttributesImpl();
+        return serviceConstructedAttributes;
     }
 
     /**
@@ -806,9 +707,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceDataAttribute createTServiceDataAttribute() {
-        TServiceDataAttributeImpl tServiceDataAttribute = new TServiceDataAttributeImpl();
-        return tServiceDataAttribute;
+    public ServiceDataAttribute createServiceDataAttribute() {
+        ServiceDataAttributeImpl serviceDataAttribute = new ServiceDataAttributeImpl();
+        return serviceDataAttribute;
     }
 
     /**
@@ -817,9 +718,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceNS createTServiceNS() {
-        TServiceNSImpl tServiceNS = new TServiceNSImpl();
-        return tServiceNS;
+    public ServiceNS createServiceNS() {
+        ServiceNSImpl serviceNS = new ServiceNSImpl();
+        return serviceNS;
     }
 
     /**
@@ -828,9 +729,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceNsUsage createTServiceNsUsage() {
-        TServiceNsUsageImpl tServiceNsUsage = new TServiceNsUsageImpl();
-        return tServiceNsUsage;
+    public ServiceNsUsage createServiceNsUsage() {
+        ServiceNsUsageImpl serviceNsUsage = new ServiceNsUsageImpl();
+        return serviceNsUsage;
     }
 
     /**
@@ -839,9 +740,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceParameter createTServiceParameter() {
-        TServiceParameterImpl tServiceParameter = new TServiceParameterImpl();
-        return tServiceParameter;
+    public ServiceParameter createServiceParameter() {
+        ServiceParameterImpl serviceParameter = new ServiceParameterImpl();
+        return serviceParameter;
     }
 
     /**
@@ -850,9 +751,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceTypeRealization createTServiceTypeRealization() {
-        TServiceTypeRealizationImpl tServiceTypeRealization = new TServiceTypeRealizationImpl();
-        return tServiceTypeRealization;
+    public ServiceTypeRealization createServiceTypeRealization() {
+        ServiceTypeRealizationImpl serviceTypeRealization = new ServiceTypeRealizationImpl();
+        return serviceTypeRealization;
     }
 
     /**
@@ -861,9 +762,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TServiceTypeRealizations createTServiceTypeRealizations() {
-        TServiceTypeRealizationsImpl tServiceTypeRealizations = new TServiceTypeRealizationsImpl();
-        return tServiceTypeRealizations;
+    public ServiceTypeRealizations createServiceTypeRealizations() {
+        ServiceTypeRealizationsImpl serviceTypeRealizations = new ServiceTypeRealizationsImpl();
+        return serviceTypeRealizations;
     }
 
     /**
@@ -872,9 +773,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TSubDataAttribute createTSubDataAttribute() {
-        TSubDataAttributeImpl tSubDataAttribute = new TSubDataAttributeImpl();
-        return tSubDataAttribute;
+    public SubDataAttribute createSubDataAttribute() {
+        SubDataAttributeImpl subDataAttribute = new SubDataAttributeImpl();
+        return subDataAttribute;
     }
 
     /**
@@ -883,9 +784,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TSubDataObject createTSubDataObject() {
-        TSubDataObjectImpl tSubDataObject = new TSubDataObjectImpl();
-        return tSubDataObject;
+    public SubDataObject createSubDataObject() {
+        SubDataObjectImpl subDataObject = new SubDataObjectImpl();
+        return subDataObject;
     }
 
     /**
@@ -894,9 +795,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * @generated
      */
     @Override
-    public TTitledClass createTTitledClass() {
-        TTitledClassImpl tTitledClass = new TTitledClassImpl();
-        return tTitledClass;
+    public TitledClass createTitledClass() {
+        TitledClassImpl titledClass = new TitledClassImpl();
+        return titledClass;
     }
 
     /**
@@ -904,8 +805,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TACSIServicesKind createTACSIServicesKindFromString( EDataType eDataType, String initialValue ) {
-        TACSIServicesKind result = TACSIServicesKind.get( initialValue );
+    public ACSIServicesKind createACSIServicesKindFromString( EDataType eDataType, String initialValue ) {
+        ACSIServicesKind result = ACSIServicesKind.get( initialValue );
         if( result == null ) throw new IllegalArgumentException(
                 "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
@@ -916,7 +817,7 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTACSIServicesKindToString( EDataType eDataType, Object instanceValue ) {
+    public String convertACSIServicesKindToString( EDataType eDataType, Object instanceValue ) {
         return instanceValue == null ? null : instanceValue.toString();
     }
 
@@ -925,8 +826,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TCBKind createTCBKindFromString( EDataType eDataType, String initialValue ) {
-        TCBKind result = TCBKind.get( initialValue );
+    public CBKind createCBKindFromString( EDataType eDataType, String initialValue ) {
+        CBKind result = CBKind.get( initialValue );
         if( result == null ) throw new IllegalArgumentException(
                 "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
@@ -937,7 +838,7 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTCBKindToString( EDataType eDataType, Object instanceValue ) {
+    public String convertCBKindToString( EDataType eDataType, Object instanceValue ) {
         return instanceValue == null ? null : instanceValue.toString();
     }
 
@@ -946,9 +847,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TDefinedAttributeTypeKind createTDefinedAttributeTypeKindFromString( EDataType eDataType,
+    public DefinedAttributeTypeKind createDefinedAttributeTypeKindFromString( EDataType eDataType,
             String initialValue ) {
-        TDefinedAttributeTypeKind result = TDefinedAttributeTypeKind.get( initialValue );
+        DefinedAttributeTypeKind result = DefinedAttributeTypeKind.get( initialValue );
         if( result == null ) throw new IllegalArgumentException(
                 "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
@@ -959,7 +860,7 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTDefinedAttributeTypeKindToString( EDataType eDataType, Object instanceValue ) {
+    public String convertDefinedAttributeTypeKindToString( EDataType eDataType, Object instanceValue ) {
         return instanceValue == null ? null : instanceValue.toString();
     }
 
@@ -968,8 +869,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TLicenseKind createTLicenseKindFromString( EDataType eDataType, String initialValue ) {
-        TLicenseKind result = TLicenseKind.get( initialValue );
+    public LicenseKind createLicenseKindFromString( EDataType eDataType, String initialValue ) {
+        LicenseKind result = LicenseKind.get( initialValue );
         if( result == null ) throw new IllegalArgumentException(
                 "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
@@ -980,7 +881,7 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTLicenseKindToString( EDataType eDataType, Object instanceValue ) {
+    public String convertLicenseKindToString( EDataType eDataType, Object instanceValue ) {
         return instanceValue == null ? null : instanceValue.toString();
     }
 
@@ -989,8 +890,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TPubStage createTPubStageFromString( EDataType eDataType, String initialValue ) {
-        TPubStage result = TPubStage.get( initialValue );
+    public PubStage createPubStageFromString( EDataType eDataType, String initialValue ) {
+        PubStage result = PubStage.get( initialValue );
         if( result == null ) throw new IllegalArgumentException(
                 "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
@@ -1001,7 +902,7 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTPubStageToString( EDataType eDataType, Object instanceValue ) {
+    public String convertPubStageToString( EDataType eDataType, Object instanceValue ) {
         return instanceValue == null ? null : instanceValue.toString();
     }
 
@@ -1010,9 +911,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TUndefinedAttributeTypeKind createTUndefinedAttributeTypeKindFromString( EDataType eDataType,
+    public UndefinedAttributeTypeKind createUndefinedAttributeTypeKindFromString( EDataType eDataType,
             String initialValue ) {
-        TUndefinedAttributeTypeKind result = TUndefinedAttributeTypeKind.get( initialValue );
+        UndefinedAttributeTypeKind result = UndefinedAttributeTypeKind.get( initialValue );
         if( result == null ) throw new IllegalArgumentException(
                 "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
@@ -1023,7 +924,7 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTUndefinedAttributeTypeKindToString( EDataType eDataType, Object instanceValue ) {
+    public String convertUndefinedAttributeTypeKindToString( EDataType eDataType, Object instanceValue ) {
         return instanceValue == null ? null : instanceValue.toString();
     }
 
@@ -1032,63 +933,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String createTAbbreviationNameFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NORMALIZED_STRING,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTAbbreviationNameToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NORMALIZED_STRING, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTAbstractLNClassNameFromString( EDataType eDataType, String initialValue ) {
-        return createTIec61850NameFromString( NsdPackage.Literals.TIEC61850_NAME, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTAbstractLNClassNameToString( EDataType eDataType, Object instanceValue ) {
-        return convertTIec61850NameToString( NsdPackage.Literals.TIEC61850_NAME, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public TACSIServicesKind createTACSIServicesKindObjectFromString( EDataType eDataType, String initialValue ) {
-        return createTACSIServicesKindFromString( NsdPackage.Literals.TACSI_SERVICES_KIND, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTACSIServicesKindObjectToString( EDataType eDataType, Object instanceValue ) {
-        return convertTACSIServicesKindToString( NsdPackage.Literals.TACSI_SERVICES_KIND, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTAttributeNameFromString( EDataType eDataType, String initialValue ) {
-        return createTIec61850NameFromString( NsdPackage.Literals.TIEC61850_NAME, initialValue );
+    public ACSIServicesKind createACSIServicesKindObjectFromString( EDataType eDataType, String initialValue ) {
+        return createACSIServicesKindFromString( NsdPackage.Literals.ACSI_SERVICES_KIND, initialValue );
     }
 
     /**
@@ -1096,8 +942,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTAttributeNameToString( EDataType eDataType, Object instanceValue ) {
-        return convertTIec61850NameToString( NsdPackage.Literals.TIEC61850_NAME, instanceValue );
+    public String convertACSIServicesKindObjectToString( EDataType eDataType, Object instanceValue ) {
+        return convertACSIServicesKindToString( NsdPackage.Literals.ACSI_SERVICES_KIND, instanceValue );
     }
 
     /**
@@ -1105,13 +951,13 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public Enumerator createTAttributeTypeKindFromString( EDataType eDataType, String initialValue ) {
+    public Enumerator createAttributeTypeKindFromString( EDataType eDataType, String initialValue ) {
         if( initialValue == null ) return null;
         Enumerator result = null;
         RuntimeException exception = null;
         try {
-            result = createTDefinedAttributeTypeKindFromString(
-                    NsdPackage.Literals.TDEFINED_ATTRIBUTE_TYPE_KIND, initialValue );
+            result = createDefinedAttributeTypeKindFromString(
+                    NsdPackage.Literals.DEFINED_ATTRIBUTE_TYPE_KIND, initialValue );
             if( result != null && Diagnostician.INSTANCE.validate( eDataType, result, null, null ) ) {
                 return result;
             }
@@ -1120,8 +966,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
             exception = e;
         }
         try {
-            result = createTUndefinedAttributeTypeKindFromString(
-                    NsdPackage.Literals.TUNDEFINED_ATTRIBUTE_TYPE_KIND, initialValue );
+            result = createUndefinedAttributeTypeKindFromString(
+                    NsdPackage.Literals.UNDEFINED_ATTRIBUTE_TYPE_KIND, initialValue );
             if( result != null && Diagnostician.INSTANCE.validate( eDataType, result, null, null ) ) {
                 return result;
             }
@@ -1139,22 +985,22 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTAttributeTypeKindToString( EDataType eDataType, Object instanceValue ) {
+    public String convertAttributeTypeKindToString( EDataType eDataType, Object instanceValue ) {
         if( instanceValue == null ) return null;
-        if( NsdPackage.Literals.TDEFINED_ATTRIBUTE_TYPE_KIND.isInstance( instanceValue ) ) {
+        if( NsdPackage.Literals.DEFINED_ATTRIBUTE_TYPE_KIND.isInstance( instanceValue ) ) {
             try {
-                String value = convertTDefinedAttributeTypeKindToString(
-                        NsdPackage.Literals.TDEFINED_ATTRIBUTE_TYPE_KIND, instanceValue );
+                String value = convertDefinedAttributeTypeKindToString( NsdPackage.Literals.DEFINED_ATTRIBUTE_TYPE_KIND,
+                        instanceValue );
                 if( value != null ) return value;
             }
             catch( Exception e ) {
                 // Keep trying other member types until all have failed.
             }
         }
-        if( NsdPackage.Literals.TUNDEFINED_ATTRIBUTE_TYPE_KIND.isInstance( instanceValue ) ) {
+        if( NsdPackage.Literals.UNDEFINED_ATTRIBUTE_TYPE_KIND.isInstance( instanceValue ) ) {
             try {
-                String value = convertTUndefinedAttributeTypeKindToString(
-                        NsdPackage.Literals.TUNDEFINED_ATTRIBUTE_TYPE_KIND, instanceValue );
+                String value = convertUndefinedAttributeTypeKindToString(
+                        NsdPackage.Literals.UNDEFINED_ATTRIBUTE_TYPE_KIND, instanceValue );
                 if( value != null ) return value;
             }
             catch( Exception e ) {
@@ -1170,8 +1016,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String createTBasicTypeNameFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.TOKEN, initialValue );
+    public CBKind createCBKindObjectFromString( EDataType eDataType, String initialValue ) {
+        return createCBKindFromString( NsdPackage.Literals.CB_KIND, initialValue );
     }
 
     /**
@@ -1179,8 +1025,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTBasicTypeNameToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.TOKEN, instanceValue );
+    public String convertCBKindObjectToString( EDataType eDataType, Object instanceValue ) {
+        return convertCBKindToString( NsdPackage.Literals.CB_KIND, instanceValue );
     }
 
     /**
@@ -1188,63 +1034,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TCBKind createTCBKindObjectFromString( EDataType eDataType, String initialValue ) {
-        return createTCBKindFromString( NsdPackage.Literals.TCB_KIND, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTCBKindObjectToString( EDataType eDataType, Object instanceValue ) {
-        return convertTCBKindToString( NsdPackage.Literals.TCB_KIND, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTCDCNameFromString( EDataType eDataType, String initialValue ) {
-        return createTIec61850NameFromString( NsdPackage.Literals.TIEC61850_NAME, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTCDCNameToString( EDataType eDataType, Object instanceValue ) {
-        return convertTIec61850NameToString( NsdPackage.Literals.TIEC61850_NAME, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTDataObjectNameFromString( EDataType eDataType, String initialValue ) {
-        return createTIec61850NameFromString( NsdPackage.Literals.TIEC61850_NAME, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTDataObjectNameToString( EDataType eDataType, Object instanceValue ) {
-        return convertTIec61850NameToString( NsdPackage.Literals.TIEC61850_NAME, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public TDefinedAttributeTypeKind createTDefinedAttributeTypeKindObjectFromString( EDataType eDataType,
+    public DefinedAttributeTypeKind createDefinedAttributeTypeKindObjectFromString( EDataType eDataType,
             String initialValue ) {
-        return createTDefinedAttributeTypeKindFromString( NsdPackage.Literals.TDEFINED_ATTRIBUTE_TYPE_KIND,
+        return createDefinedAttributeTypeKindFromString( NsdPackage.Literals.DEFINED_ATTRIBUTE_TYPE_KIND,
                 initialValue );
     }
 
@@ -1253,8 +1045,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTDefinedAttributeTypeKindObjectToString( EDataType eDataType, Object instanceValue ) {
-        return convertTDefinedAttributeTypeKindToString( NsdPackage.Literals.TDEFINED_ATTRIBUTE_TYPE_KIND,
+    public String convertDefinedAttributeTypeKindObjectToString( EDataType eDataType, Object instanceValue ) {
+        return convertDefinedAttributeTypeKindToString( NsdPackage.Literals.DEFINED_ATTRIBUTE_TYPE_KIND,
                 instanceValue );
     }
 
@@ -1263,342 +1055,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String createTDocIDFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NORMALIZED_STRING,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTDocIDToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NORMALIZED_STRING, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTEmptyStringFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NORMALIZED_STRING,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTEmptyStringToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NORMALIZED_STRING, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTFCAbbreviationFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.TOKEN, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTFCAbbreviationToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.TOKEN, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTIec61850NameFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NAME, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTIec61850NameToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NAME, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTIec61850NameStringFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NORMALIZED_STRING,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTIec61850NameStringToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NORMALIZED_STRING, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTissuesTypeFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NORMALIZED_STRING,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTissuesTypeToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NORMALIZED_STRING, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public TLicenseKind createTLicenseKindObjectFromString( EDataType eDataType, String initialValue ) {
-        return createTLicenseKindFromString( NsdPackage.Literals.TLICENSE_KIND, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTLicenseKindObjectToString( EDataType eDataType, Object instanceValue ) {
-        return convertTLicenseKindToString( NsdPackage.Literals.TLICENSE_KIND, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTLiteralNameFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NORMALIZED_STRING,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTLiteralNameToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NORMALIZED_STRING, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTLNClassNameFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NAME, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTLNClassNameToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NAME, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTNSIdentifierFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NORMALIZED_STRING,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTNSIdentifierToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NORMALIZED_STRING, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Short createTNSReleaseFromString( EDataType eDataType, String initialValue ) {
-        return ( Short ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.UNSIGNED_BYTE,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTNSReleaseToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.UNSIGNED_BYTE, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Short createTNSReleaseObjectFromString( EDataType eDataType, String initialValue ) {
-        return createTNSReleaseFromString( NsdPackage.Literals.TNS_RELEASE, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTNSReleaseObjectToString( EDataType eDataType, Object instanceValue ) {
-        return convertTNSReleaseToString( NsdPackage.Literals.TNS_RELEASE, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTNSRevisionFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.TOKEN, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTNSRevisionToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.TOKEN, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Integer createTNSVersionFromString( EDataType eDataType, String initialValue ) {
-        return ( Integer ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.UNSIGNED_SHORT,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTNSVersionToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.UNSIGNED_SHORT, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Integer createTNSVersionObjectFromString( EDataType eDataType, String initialValue ) {
-        return createTNSVersionFromString( NsdPackage.Literals.TNS_VERSION, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTNSVersionObjectToString( EDataType eDataType, Object instanceValue ) {
-        return convertTNSVersionToString( NsdPackage.Literals.TNS_VERSION, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTPresenceConditionArgumentFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NORMALIZED_STRING,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTPresenceConditionArgumentToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NORMALIZED_STRING, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTPresenceConditionNameFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NORMALIZED_STRING,
-                initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTPresenceConditionNameToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NORMALIZED_STRING, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public TPubStage createTPubStageObjectFromString( EDataType eDataType, String initialValue ) {
-        return createTPubStageFromString( NsdPackage.Literals.TPUB_STAGE, initialValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertTPubStageObjectToString( EDataType eDataType, Object instanceValue ) {
-        return convertTPubStageToString( NsdPackage.Literals.TPUB_STAGE, instanceValue );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String createTSubDataObjectNameFromString( EDataType eDataType, String initialValue ) {
-        return createTIec61850NameFromString( NsdPackage.Literals.TIEC61850_NAME, initialValue );
+    public LicenseKind createLicenseKindObjectFromString( EDataType eDataType, String initialValue ) {
+        return createLicenseKindFromString( NsdPackage.Literals.LICENSE_KIND, initialValue );
     }
 
     /**
@@ -1606,8 +1064,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTSubDataObjectNameToString( EDataType eDataType, Object instanceValue ) {
-        return convertTIec61850NameToString( NsdPackage.Literals.TIEC61850_NAME, instanceValue );
+    public String convertLicenseKindObjectToString( EDataType eDataType, Object instanceValue ) {
+        return convertLicenseKindToString( NsdPackage.Literals.LICENSE_KIND, instanceValue );
     }
 
     /**
@@ -1615,8 +1073,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String createTUMLVersionFromString( EDataType eDataType, String initialValue ) {
-        return ( String ) XMLTypeFactory.eINSTANCE.createFromString( XMLTypePackage.Literals.NAME, initialValue );
+    public PubStage createPubStageObjectFromString( EDataType eDataType, String initialValue ) {
+        return createPubStageFromString( NsdPackage.Literals.PUB_STAGE, initialValue );
     }
 
     /**
@@ -1624,8 +1082,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTUMLVersionToString( EDataType eDataType, Object instanceValue ) {
-        return XMLTypeFactory.eINSTANCE.convertToString( XMLTypePackage.Literals.NAME, instanceValue );
+    public String convertPubStageObjectToString( EDataType eDataType, Object instanceValue ) {
+        return convertPubStageToString( NsdPackage.Literals.PUB_STAGE, instanceValue );
     }
 
     /**
@@ -1633,9 +1091,9 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TUndefinedAttributeTypeKind createTUndefinedAttributeTypeKindObjectFromString( EDataType eDataType,
+    public UndefinedAttributeTypeKind createUndefinedAttributeTypeKindObjectFromString( EDataType eDataType,
             String initialValue ) {
-        return createTUndefinedAttributeTypeKindFromString( NsdPackage.Literals.TUNDEFINED_ATTRIBUTE_TYPE_KIND,
+        return createUndefinedAttributeTypeKindFromString( NsdPackage.Literals.UNDEFINED_ATTRIBUTE_TYPE_KIND,
                 initialValue );
     }
 
@@ -1644,8 +1102,8 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public String convertTUndefinedAttributeTypeKindObjectToString( EDataType eDataType, Object instanceValue ) {
-        return convertTUndefinedAttributeTypeKindToString( NsdPackage.Literals.TUNDEFINED_ATTRIBUTE_TYPE_KIND,
+    public String convertUndefinedAttributeTypeKindObjectToString( EDataType eDataType, Object instanceValue ) {
+        return convertUndefinedAttributeTypeKindToString( NsdPackage.Literals.UNDEFINED_ATTRIBUTE_TYPE_KIND,
                 instanceValue );
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java
index 5c1014396304824015d5d0d52ff44fda4de4f04c..5656b9f9390abd53f0b98f0daae2d2dfc82e8fca 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java
@@ -19,62 +19,63 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CBKind;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOnType;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentRoot;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.License;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LicenseKind;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCBKind;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicenseKind;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TUndefinedAttributeTypeKind;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.UndefinedAttributeTypeKind;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdValidator;
 
@@ -132,904 +133,438 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tAbbreviationEClass = null;
+    private EClass abbreviationEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tAbbreviationsEClass = null;
+    private EClass abbreviationsEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tAbstractLNClassEClass = null;
+    private EClass abstractLNClassEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tAnyLNClassEClass = null;
+    private EClass anyLNClassEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tApplicableServiceNSEClass = null;
+    private EClass applicableServiceNSEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tApplicableServicesEClass = null;
+    private EClass applicableServicesEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tBasicTypeEClass = null;
+    private EClass basicTypeEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tBasicTypesEClass = null;
+    private EClass basicTypesEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tcdcEClass = null;
+    private EClass cdcEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tcdCsEClass = null;
+    private EClass cdCsEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tChangesEClass = null;
+    private EClass changesEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tConstructedAttributeEClass = null;
+    private EClass constructedAttributeEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tConstructedAttributesEClass = null;
+    private EClass constructedAttributesEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tCopyrightedEClass = null;
+    private EClass copyrightedEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tCopyrightNoticeEClass = null;
+    private EClass copyrightNoticeEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tDataAttributeEClass = null;
+    private EClass dataAttributeEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tDataObjectEClass = null;
+    private EClass dataObjectEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tDataSetMemberOfEClass = null;
+    private EClass dataSetMemberOfEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tDocEClass = null;
+    private EClass docEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tDocumentedClassEClass = null;
+    private EClass documentedClassEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tEnumerationEClass = null;
+    private EClass enumerationEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tEnumerationsEClass = null;
+    private EClass enumerationsEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tFunctionalConstraintEClass = null;
+    private EClass functionalConstraintEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tFunctionalConstraintsEClass = null;
+    private EClass functionalConstraintsEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tLicenseEClass = null;
+    private EClass licenseEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tLiteralEClass = null;
+    private EClass literalEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tlnClassEClass = null;
+    private EClass lnClassEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tlnClassesEClass = null;
+    private EClass lnClassesEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tNoticeEClass = null;
+    private EClass noticeEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tnsEClass = null;
+    private EClass nsEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tnsDocEClass = null;
+    private EClass nsDocEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tPresenceConditionEClass = null;
+    private EClass presenceConditionEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tPresenceConditionsEClass = null;
+    private EClass presenceConditionsEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceCDCEClass = null;
+    private EClass serviceCDCEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceCDCsEClass = null;
+    private EClass serviceCDCsEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceConstructedAttributeEClass = null;
+    private EClass serviceConstructedAttributeEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceConstructedAttributesEClass = null;
+    private EClass serviceConstructedAttributesEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceDataAttributeEClass = null;
+    private EClass serviceDataAttributeEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceNSEClass = null;
+    private EClass serviceNSEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceNsUsageEClass = null;
+    private EClass serviceNsUsageEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceParameterEClass = null;
+    private EClass serviceParameterEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceTypeRealizationEClass = null;
+    private EClass serviceTypeRealizationEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tServiceTypeRealizationsEClass = null;
+    private EClass serviceTypeRealizationsEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tSubDataAttributeEClass = null;
+    private EClass subDataAttributeEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tSubDataObjectEClass = null;
+    private EClass subDataObjectEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EClass tTitledClassEClass = null;
+    private EClass titledClassEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EEnum tacsiServicesKindEEnum = null;
+    private EClass nsdObjectWithVersionAndReleaseEClass = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EEnum tcbKindEEnum = null;
+    private EEnum acsiServicesKindEEnum = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EEnum tDefinedAttributeTypeKindEEnum = null;
+    private EEnum cbKindEEnum = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EEnum tLicenseKindEEnum = null;
+    private EEnum definedAttributeTypeKindEEnum = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EEnum tPubStageEEnum = null;
+    private EEnum licenseKindEEnum = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EEnum tUndefinedAttributeTypeKindEEnum = null;
+    private EEnum pubStageEEnum = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EDataType tAbbreviationNameEDataType = null;
+    private EEnum undefinedAttributeTypeKindEEnum = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EDataType tAbstractLNClassNameEDataType = null;
+    private EDataType acsiServicesKindObjectEDataType = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EDataType tacsiServicesKindObjectEDataType = null;
+    private EDataType attributeTypeKindEDataType = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EDataType tAttributeNameEDataType = null;
+    private EDataType cbKindObjectEDataType = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EDataType tAttributeTypeKindEDataType = null;
+    private EDataType definedAttributeTypeKindObjectEDataType = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EDataType tBasicTypeNameEDataType = null;
+    private EDataType licenseKindObjectEDataType = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EDataType tcbKindObjectEDataType = null;
+    private EDataType pubStageObjectEDataType = null;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    private EDataType tcdcNameEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tDataObjectNameEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tDefinedAttributeTypeKindObjectEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tDocIDEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tEmptyStringEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tfcAbbreviationEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tIec61850NameEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tIec61850NameStringEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tissuesTypeEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tLicenseKindObjectEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tLiteralNameEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tlnClassNameEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tnsIdentifierEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tnsReleaseEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tnsReleaseObjectEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tnsRevisionEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tnsVersionEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tnsVersionObjectEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tPresenceConditionArgumentEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tPresenceConditionNameEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tPubStageObjectEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tSubDataObjectNameEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tumlVersionEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType tUndefinedAttributeTypeKindObjectEDataType = null;
-
-    /**
-     * Creates an instance of the model <b>Package</b>, registered with
-     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-     * package URI value.
-     * <p>Note: the correct way to create the package is via the static
-     * factory method {@link #init init()}, which also performs
-     * initialization of the package, or returns the registered package,
-     * if one already exists.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.emf.ecore.EPackage.Registry
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#eNS_URI
-     * @see #init()
-     * @generated
-     */
-    private NsdPackageImpl() {
-        super( eNS_URI, NsdFactory.eINSTANCE );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static boolean isInited = false;
-
-    /**
-     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-     *
-     * <p>This method is used to initialize {@link NsdPackage#eINSTANCE} when that field is accessed.
-     * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #eNS_URI
-     * @see #createPackageContents()
-     * @see #initializePackageContents()
-     * @generated
-     */
-    public static NsdPackage init() {
-        if( isInited ) return ( NsdPackage ) EPackage.Registry.INSTANCE.getEPackage( NsdPackage.eNS_URI );
-
-        // Obtain or create and register package
-        Object registeredNsdPackage = EPackage.Registry.INSTANCE.get( eNS_URI );
-        NsdPackageImpl theNsdPackage = registeredNsdPackage instanceof NsdPackageImpl
-                ? ( NsdPackageImpl ) registeredNsdPackage
-                : new NsdPackageImpl();
-
-        isInited = true;
-
-        // Initialize simple dependencies
-        XMLTypePackage.eINSTANCE.eClass();
-
-        // Create package meta-data objects
-        theNsdPackage.createPackageContents();
-
-        // Initialize created meta-data
-        theNsdPackage.initializePackageContents();
-
-        // Register package validator
-        EValidator.Registry.INSTANCE.put( theNsdPackage, new EValidator.Descriptor() {
-            @Override
-            public EValidator getEValidator() {
-                return NsdValidator.INSTANCE;
-            }
-        } );
-
-        // Mark meta-data to indicate it can't be changed
-        theNsdPackage.freeze();
-
-        // Update the registry and return the package
-        EPackage.Registry.INSTANCE.put( NsdPackage.eNS_URI, theNsdPackage );
-        return theNsdPackage;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EClass getAppliesToType() {
-        return appliesToTypeEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getAppliesToType_Id() {
-        return ( EAttribute ) appliesToTypeEClass.getEStructuralFeatures().get( 0 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getAppliesToType_PublicationStage() {
-        return ( EAttribute ) appliesToTypeEClass.getEStructuralFeatures().get( 1 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getAppliesToType_Release() {
-        return ( EAttribute ) appliesToTypeEClass.getEStructuralFeatures().get( 2 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getAppliesToType_Revision() {
-        return ( EAttribute ) appliesToTypeEClass.getEStructuralFeatures().get( 3 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getAppliesToType_Version() {
-        return ( EAttribute ) appliesToTypeEClass.getEStructuralFeatures().get( 4 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EClass getDependsOnType() {
-        return dependsOnTypeEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getDependsOnType_Id() {
-        return ( EAttribute ) dependsOnTypeEClass.getEStructuralFeatures().get( 0 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getDependsOnType_PublicationStage() {
-        return ( EAttribute ) dependsOnTypeEClass.getEStructuralFeatures().get( 1 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getDependsOnType_Release() {
-        return ( EAttribute ) dependsOnTypeEClass.getEStructuralFeatures().get( 2 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getDependsOnType_Revision() {
-        return ( EAttribute ) dependsOnTypeEClass.getEStructuralFeatures().get( 3 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getDependsOnType_Version() {
-        return ( EAttribute ) dependsOnTypeEClass.getEStructuralFeatures().get( 4 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EClass getDocumentRoot() {
-        return documentRootEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getDocumentRoot_Mixed() {
-        return ( EAttribute ) documentRootEClass.getEStructuralFeatures().get( 0 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getDocumentRoot_XMLNSPrefixMap() {
-        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 1 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getDocumentRoot_XSISchemaLocation() {
-        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 2 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getDocumentRoot_ApplicableServiceNS() {
-        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 3 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getDocumentRoot_Copyright() {
-        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 4 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getDocumentRoot_NS() {
-        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 5 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getDocumentRoot_NSDoc() {
-        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 6 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getDocumentRoot_ServiceNS() {
-        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 7 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EClass getServiceType() {
-        return serviceTypeEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getServiceType_Name() {
-        return ( EAttribute ) serviceTypeEClass.getEStructuralFeatures().get( 0 );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EClass getTAbbreviation() {
-        return tAbbreviationEClass;
-    }
+    private EDataType undefinedAttributeTypeKindObjectEDataType = null;
 
     /**
+     * Creates an instance of the model <b>Package</b>, registered with
+     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+     * package URI value.
+     * <p>Note: the correct way to create the package is via the static
+     * factory method {@link #init init()}, which also performs
+     * initialization of the package, or returns the registered package,
+     * if one already exists.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @see org.eclipse.emf.ecore.EPackage.Registry
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#eNS_URI
+     * @see #init()
      * @generated
      */
-    @Override
-    public EAttribute getTAbbreviation_DescID() {
-        return ( EAttribute ) tAbbreviationEClass.getEStructuralFeatures().get( 0 );
+    private NsdPackageImpl() {
+        super( eNS_URI, NsdFactory.eINSTANCE );
     }
 
     /**
@@ -1037,99 +572,54 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * <!-- end-user-doc -->
      * @generated
      */
-    @Override
-    public EAttribute getTAbbreviation_Name() {
-        return ( EAttribute ) tAbbreviationEClass.getEStructuralFeatures().get( 1 );
-    }
+    private static boolean isInited = false;
 
     /**
+     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+     *
+     * <p>This method is used to initialize {@link NsdPackage#eINSTANCE} when that field is accessed.
+     * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @see #eNS_URI
+     * @see #createPackageContents()
+     * @see #initializePackageContents()
      * @generated
      */
-    @Override
-    public EClass getTAbbreviations() {
-        return tAbbreviationsEClass;
-    }
+    public static NsdPackage init() {
+        if( isInited ) return ( NsdPackage ) EPackage.Registry.INSTANCE.getEPackage( NsdPackage.eNS_URI );
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getTAbbreviations_Abbreviation() {
-        return ( EReference ) tAbbreviationsEClass.getEStructuralFeatures().get( 0 );
-    }
+        // Obtain or create and register package
+        Object registeredNsdPackage = EPackage.Registry.INSTANCE.get( eNS_URI );
+        NsdPackageImpl theNsdPackage = registeredNsdPackage instanceof NsdPackageImpl
+                ? ( NsdPackageImpl ) registeredNsdPackage
+                : new NsdPackageImpl();
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EClass getTAbstractLNClass() {
-        return tAbstractLNClassEClass;
-    }
+        isInited = true;
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getTAbstractLNClass_Name() {
-        return ( EAttribute ) tAbstractLNClassEClass.getEStructuralFeatures().get( 0 );
-    }
+        // Initialize simple dependencies
+        XMLTypePackage.eINSTANCE.eClass();
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EClass getTAnyLNClass() {
-        return tAnyLNClassEClass;
-    }
+        // Create package meta-data objects
+        theNsdPackage.createPackageContents();
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getTAnyLNClass_DataObject() {
-        return ( EReference ) tAnyLNClassEClass.getEStructuralFeatures().get( 0 );
-    }
+        // Initialize created meta-data
+        theNsdPackage.initializePackageContents();
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EAttribute getTAnyLNClass_Base() {
-        return ( EAttribute ) tAnyLNClassEClass.getEStructuralFeatures().get( 1 );
-    }
+        // Register package validator
+        EValidator.Registry.INSTANCE.put( theNsdPackage, new EValidator.Descriptor() {
+            @Override
+            public EValidator getEValidator() {
+                return NsdValidator.INSTANCE;
+            }
+        } );
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EClass getTApplicableServiceNS() {
-        return tApplicableServiceNSEClass;
-    }
+        // Mark meta-data to indicate it can't be changed
+        theNsdPackage.freeze();
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EReference getTApplicableServiceNS_ServiceNsUsage() {
-        return ( EReference ) tApplicableServiceNSEClass.getEStructuralFeatures().get( 0 );
+        // Update the registry and return the package
+        EPackage.Registry.INSTANCE.put( NsdPackage.eNS_URI, theNsdPackage );
+        return theNsdPackage;
     }
 
     /**
@@ -1138,8 +628,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTApplicableServiceNS_Date() {
-        return ( EAttribute ) tApplicableServiceNSEClass.getEStructuralFeatures().get( 1 );
+    public EClass getAppliesToType() {
+        return appliesToTypeEClass;
     }
 
     /**
@@ -1148,8 +638,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTApplicableServiceNS_Version() {
-        return ( EAttribute ) tApplicableServiceNSEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getAppliesToType_Id() {
+        return ( EAttribute ) appliesToTypeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1158,8 +648,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTApplicableServices() {
-        return tApplicableServicesEClass;
+    public EAttribute getAppliesToType_PublicationStage() {
+        return ( EAttribute ) appliesToTypeEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1168,8 +658,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTApplicableServices_Service() {
-        return ( EReference ) tApplicableServicesEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getAppliesToType_Revision() {
+        return ( EAttribute ) appliesToTypeEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1178,8 +668,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTApplicableServices_DataSetMemberOf() {
-        return ( EReference ) tApplicableServicesEClass.getEStructuralFeatures().get( 1 );
+    public EClass getDependsOnType() {
+        return dependsOnTypeEClass;
     }
 
     /**
@@ -1188,8 +678,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTBasicType() {
-        return tBasicTypeEClass;
+    public EAttribute getDependsOnType_Id() {
+        return ( EAttribute ) dependsOnTypeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1198,8 +688,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTBasicType_DescID() {
-        return ( EAttribute ) tBasicTypeEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDependsOnType_PublicationStage() {
+        return ( EAttribute ) dependsOnTypeEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1208,8 +698,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTBasicType_Name() {
-        return ( EAttribute ) tBasicTypeEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getDependsOnType_Revision() {
+        return ( EAttribute ) dependsOnTypeEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1218,8 +708,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTBasicTypes() {
-        return tBasicTypesEClass;
+    public EClass getDocumentRoot() {
+        return documentRootEClass;
     }
 
     /**
@@ -1228,8 +718,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTBasicTypes_BasicType() {
-        return ( EReference ) tBasicTypesEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDocumentRoot_Mixed() {
+        return ( EAttribute ) documentRootEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1238,8 +728,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTCDC() {
-        return tcdcEClass;
+    public EReference getDocumentRoot_XMLNSPrefixMap() {
+        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1248,8 +738,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTCDC_SubDataObject() {
-        return ( EReference ) tcdcEClass.getEStructuralFeatures().get( 0 );
+    public EReference getDocumentRoot_XSISchemaLocation() {
+        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1258,8 +748,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTCDC_DataAttribute() {
-        return ( EReference ) tcdcEClass.getEStructuralFeatures().get( 1 );
+    public EReference getDocumentRoot_ApplicableServiceNS() {
+        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1268,8 +758,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTCDC_ServiceParameter() {
-        return ( EReference ) tcdcEClass.getEStructuralFeatures().get( 2 );
+    public EReference getDocumentRoot_Copyright() {
+        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -1278,8 +768,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTCDC_EnumParameterized() {
-        return ( EAttribute ) tcdcEClass.getEStructuralFeatures().get( 3 );
+    public EReference getDocumentRoot_NS() {
+        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -1288,8 +778,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTCDC_Name() {
-        return ( EAttribute ) tcdcEClass.getEStructuralFeatures().get( 4 );
+    public EReference getDocumentRoot_NSDoc() {
+        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -1298,8 +788,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTCDC_Statistics() {
-        return ( EAttribute ) tcdcEClass.getEStructuralFeatures().get( 5 );
+    public EReference getDocumentRoot_ServiceNS() {
+        return ( EReference ) documentRootEClass.getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -1308,8 +798,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTCDC_TypeKindParameterized() {
-        return ( EAttribute ) tcdcEClass.getEStructuralFeatures().get( 6 );
+    public EClass getServiceType() {
+        return serviceTypeEClass;
     }
 
     /**
@@ -1318,8 +808,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTCDC_Variant() {
-        return ( EAttribute ) tcdcEClass.getEStructuralFeatures().get( 7 );
+    public EAttribute getServiceType_Name() {
+        return ( EAttribute ) serviceTypeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1328,8 +818,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTCDCs() {
-        return tcdCsEClass;
+    public EClass getAbbreviation() {
+        return abbreviationEClass;
     }
 
     /**
@@ -1338,8 +828,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTCDCs_CDC() {
-        return ( EReference ) tcdCsEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getAbbreviation_DescID() {
+        return ( EAttribute ) abbreviationEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1348,8 +838,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTChanges() {
-        return tChangesEClass;
+    public EAttribute getAbbreviation_Name() {
+        return ( EAttribute ) abbreviationEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1358,8 +848,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTChanges_ChangesID() {
-        return ( EAttribute ) tChangesEClass.getEStructuralFeatures().get( 0 );
+    public EClass getAbbreviations() {
+        return abbreviationsEClass;
     }
 
     /**
@@ -1368,8 +858,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTChanges_Date() {
-        return ( EAttribute ) tChangesEClass.getEStructuralFeatures().get( 1 );
+    public EReference getAbbreviations_Abbreviation() {
+        return ( EReference ) abbreviationsEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1378,8 +868,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTChanges_Release() {
-        return ( EAttribute ) tChangesEClass.getEStructuralFeatures().get( 2 );
+    public EClass getAbstractLNClass() {
+        return abstractLNClassEClass;
     }
 
     /**
@@ -1388,8 +878,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTChanges_Revision() {
-        return ( EAttribute ) tChangesEClass.getEStructuralFeatures().get( 3 );
+    public EAttribute getAbstractLNClass_Name() {
+        return ( EAttribute ) abstractLNClassEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1398,8 +888,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTChanges_Tissues() {
-        return ( EAttribute ) tChangesEClass.getEStructuralFeatures().get( 4 );
+    public EClass getAnyLNClass() {
+        return anyLNClassEClass;
     }
 
     /**
@@ -1408,8 +898,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTChanges_Version() {
-        return ( EAttribute ) tChangesEClass.getEStructuralFeatures().get( 5 );
+    public EReference getAnyLNClass_DataObject() {
+        return ( EReference ) anyLNClassEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1418,8 +908,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTConstructedAttribute() {
-        return tConstructedAttributeEClass;
+    public EAttribute getAnyLNClass_Base() {
+        return ( EAttribute ) anyLNClassEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1428,8 +918,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTConstructedAttribute_SubDataAttribute() {
-        return ( EReference ) tConstructedAttributeEClass.getEStructuralFeatures().get( 0 );
+    public EClass getApplicableServiceNS() {
+        return applicableServiceNSEClass;
     }
 
     /**
@@ -1438,8 +928,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTConstructedAttribute_Name() {
-        return ( EAttribute ) tConstructedAttributeEClass.getEStructuralFeatures().get( 1 );
+    public EReference getApplicableServiceNS_ServiceNsUsage() {
+        return ( EReference ) applicableServiceNSEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1448,8 +938,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTConstructedAttributes() {
-        return tConstructedAttributesEClass;
+    public EAttribute getApplicableServiceNS_Date() {
+        return ( EAttribute ) applicableServiceNSEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1458,8 +948,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTConstructedAttributes_ConstructedAttribute() {
-        return ( EReference ) tConstructedAttributesEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getApplicableServiceNS_Version() {
+        return ( EAttribute ) applicableServiceNSEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1468,8 +958,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTCopyrighted() {
-        return tCopyrightedEClass;
+    public EClass getApplicableServices() {
+        return applicableServicesEClass;
     }
 
     /**
@@ -1478,8 +968,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTCopyrighted_Copyright() {
-        return ( EReference ) tCopyrightedEClass.getEStructuralFeatures().get( 0 );
+    public EReference getApplicableServices_Service() {
+        return ( EReference ) applicableServicesEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1488,8 +978,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTCopyrightNotice() {
-        return tCopyrightNoticeEClass;
+    public EReference getApplicableServices_DataSetMemberOf() {
+        return ( EReference ) applicableServicesEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1498,8 +988,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTCopyrightNotice_Notice() {
-        return ( EReference ) tCopyrightNoticeEClass.getEStructuralFeatures().get( 0 );
+    public EClass getBasicType() {
+        return basicTypeEClass;
     }
 
     /**
@@ -1508,8 +998,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTCopyrightNotice_License() {
-        return ( EReference ) tCopyrightNoticeEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getBasicType_DescID() {
+        return ( EAttribute ) basicTypeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1518,8 +1008,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTDataAttribute() {
-        return tDataAttributeEClass;
+    public EAttribute getBasicType_Name() {
+        return ( EAttribute ) basicTypeEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1528,8 +1018,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_Dchg() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 0 );
+    public EClass getBasicTypes() {
+        return basicTypesEClass;
     }
 
     /**
@@ -1538,8 +1028,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_DefaultValue() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 1 );
+    public EReference getBasicTypes_BasicType() {
+        return ( EReference ) basicTypesEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1548,8 +1038,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_Dupd() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 2 );
+    public EClass getCDC() {
+        return cdcEClass;
     }
 
     /**
@@ -1558,8 +1048,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_Fc() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 3 );
+    public EReference getCDC_SubDataObject() {
+        return ( EReference ) cdcEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1568,8 +1058,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_IsArray() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 4 );
+    public EReference getCDC_DataAttribute() {
+        return ( EReference ) cdcEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1578,8 +1068,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_MaxIndexAttribute() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 5 );
+    public EReference getCDC_ServiceParameter() {
+        return ( EReference ) cdcEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1588,8 +1078,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_MaxValue() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 6 );
+    public EAttribute getCDC_EnumParameterized() {
+        return ( EAttribute ) cdcEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1598,8 +1088,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_MinIndex() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 7 );
+    public EAttribute getCDC_Name() {
+        return ( EAttribute ) cdcEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -1608,8 +1098,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_MinValue() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 8 );
+    public EAttribute getCDC_Statistics() {
+        return ( EAttribute ) cdcEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -1618,8 +1108,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_Name() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 9 );
+    public EAttribute getCDC_TypeKindParameterized() {
+        return ( EAttribute ) cdcEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -1628,8 +1118,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_PresCond() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 10 );
+    public EAttribute getCDC_Variant() {
+        return ( EAttribute ) cdcEClass.getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -1638,8 +1128,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_PresCondArgs() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 11 );
+    public EClass getCDCs() {
+        return cdCsEClass;
     }
 
     /**
@@ -1648,8 +1138,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_PresCondArgsID() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 12 );
+    public EReference getCDCs_CDC() {
+        return ( EReference ) cdCsEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1658,8 +1148,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_Qchg() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 13 );
+    public EClass getChanges() {
+        return changesEClass;
     }
 
     /**
@@ -1668,8 +1158,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_SizeAttribute() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 14 );
+    public EAttribute getChanges_ChangesID() {
+        return ( EAttribute ) changesEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1678,8 +1168,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_Type() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 15 );
+    public EAttribute getChanges_Date() {
+        return ( EAttribute ) changesEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1688,8 +1178,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataAttribute_TypeKind() {
-        return ( EAttribute ) tDataAttributeEClass.getEStructuralFeatures().get( 16 );
+    public EAttribute getChanges_Revision() {
+        return ( EAttribute ) changesEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1698,8 +1188,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTDataObject() {
-        return tDataObjectEClass;
+    public EAttribute getChanges_Tissues() {
+        return ( EAttribute ) changesEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1708,8 +1198,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_DsPresCond() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 0 );
+    public EClass getConstructedAttribute() {
+        return constructedAttributeEClass;
     }
 
     /**
@@ -1718,8 +1208,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_DsPresCondArgs() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 1 );
+    public EReference getConstructedAttribute_SubDataAttribute() {
+        return ( EReference ) constructedAttributeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1728,8 +1218,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_DsPresCondArgsID() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getConstructedAttribute_Name() {
+        return ( EAttribute ) constructedAttributeEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1738,8 +1228,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_Name() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 3 );
+    public EClass getConstructedAttributes() {
+        return constructedAttributesEClass;
     }
 
     /**
@@ -1748,8 +1238,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_PresCond() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 4 );
+    public EReference getConstructedAttributes_ConstructedAttribute() {
+        return ( EReference ) constructedAttributesEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1758,8 +1248,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_PresCondArgs() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 5 );
+    public EClass getCopyrighted() {
+        return copyrightedEClass;
     }
 
     /**
@@ -1768,8 +1258,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_PresCondArgsID() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 6 );
+    public EReference getCopyrighted_Copyright() {
+        return ( EReference ) copyrightedEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1778,8 +1268,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_Transient() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 7 );
+    public EClass getCopyrightNotice() {
+        return copyrightNoticeEClass;
     }
 
     /**
@@ -1788,8 +1278,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_Type() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 8 );
+    public EReference getCopyrightNotice_Notice() {
+        return ( EReference ) copyrightNoticeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1798,8 +1288,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_UnderlyingType() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 9 );
+    public EReference getCopyrightNotice_License() {
+        return ( EReference ) copyrightNoticeEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1808,8 +1298,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataObject_UnderlyingTypeKind() {
-        return ( EAttribute ) tDataObjectEClass.getEStructuralFeatures().get( 10 );
+    public EClass getDataAttribute() {
+        return dataAttributeEClass;
     }
 
     /**
@@ -1818,8 +1308,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTDataSetMemberOf() {
-        return tDataSetMemberOfEClass;
+    public EAttribute getDataAttribute_Dchg() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1828,8 +1318,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDataSetMemberOf_Cb() {
-        return ( EAttribute ) tDataSetMemberOfEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDataAttribute_DefaultValue() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1838,8 +1328,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTDoc() {
-        return tDocEClass;
+    public EAttribute getDataAttribute_Dupd() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1848,8 +1338,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDoc_Mixed() {
-        return ( EAttribute ) tDocEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDataAttribute_Fc() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1858,8 +1348,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDoc_Group() {
-        return ( EAttribute ) tDocEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getDataAttribute_IsArray() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -1868,8 +1358,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDoc_Any() {
-        return ( EAttribute ) tDocEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getDataAttribute_MaxIndexAttribute() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -1878,8 +1368,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDoc_Id() {
-        return ( EAttribute ) tDocEClass.getEStructuralFeatures().get( 3 );
+    public EAttribute getDataAttribute_MaxValue() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -1888,8 +1378,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTDocumentedClass() {
-        return tDocumentedClassEClass;
+    public EAttribute getDataAttribute_MinIndex() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -1898,8 +1388,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDocumentedClass_Deprecated() {
-        return ( EAttribute ) tDocumentedClassEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDataAttribute_MinValue() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -1908,8 +1398,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDocumentedClass_DescID() {
-        return ( EAttribute ) tDocumentedClassEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getDataAttribute_Name() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -1918,8 +1408,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTDocumentedClass_Informative() {
-        return ( EAttribute ) tDocumentedClassEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getDataAttribute_PresCond() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -1928,8 +1418,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTEnumeration() {
-        return tEnumerationEClass;
+    public EAttribute getDataAttribute_PresCondArgs() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -1938,8 +1428,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTEnumeration_Literal() {
-        return ( EReference ) tEnumerationEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDataAttribute_PresCondArgsID() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -1948,8 +1438,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTEnumeration_InheritedFrom() {
-        return ( EAttribute ) tEnumerationEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getDataAttribute_Qchg() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 13 );
     }
 
     /**
@@ -1958,8 +1448,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTEnumeration_Name() {
-        return ( EAttribute ) tEnumerationEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getDataAttribute_SizeAttribute() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 14 );
     }
 
     /**
@@ -1968,8 +1458,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTEnumerations() {
-        return tEnumerationsEClass;
+    public EAttribute getDataAttribute_Type() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 15 );
     }
 
     /**
@@ -1978,8 +1468,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTEnumerations_Enumeration() {
-        return ( EReference ) tEnumerationsEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDataAttribute_TypeKind() {
+        return ( EAttribute ) dataAttributeEClass.getEStructuralFeatures().get( 16 );
     }
 
     /**
@@ -1988,8 +1478,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTFunctionalConstraint() {
-        return tFunctionalConstraintEClass;
+    public EClass getDataObject() {
+        return dataObjectEClass;
     }
 
     /**
@@ -1998,8 +1488,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTFunctionalConstraint_ApplicableServices() {
-        return ( EReference ) tFunctionalConstraintEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDataObject_DsPresCond() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2008,8 +1498,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTFunctionalConstraint_Abbreviation() {
-        return ( EAttribute ) tFunctionalConstraintEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getDataObject_DsPresCondArgs() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2018,8 +1508,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTFunctionalConstraint_DescID() {
-        return ( EAttribute ) tFunctionalConstraintEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getDataObject_DsPresCondArgsID() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2028,8 +1518,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTFunctionalConstraint_TitleID() {
-        return ( EAttribute ) tFunctionalConstraintEClass.getEStructuralFeatures().get( 3 );
+    public EAttribute getDataObject_Name() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2038,8 +1528,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTFunctionalConstraints() {
-        return tFunctionalConstraintsEClass;
+    public EAttribute getDataObject_PresCond() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -2048,8 +1538,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTFunctionalConstraints_FunctionalConstraint() {
-        return ( EReference ) tFunctionalConstraintsEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDataObject_PresCondArgs() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -2058,8 +1548,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTLicense() {
-        return tLicenseEClass;
+    public EAttribute getDataObject_PresCondArgsID() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -2068,8 +1558,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTLicense_Mixed() {
-        return ( EAttribute ) tLicenseEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDataObject_Transient() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -2078,8 +1568,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTLicense_Kind() {
-        return ( EAttribute ) tLicenseEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getDataObject_Type() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -2088,8 +1578,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTLicense_Uri() {
-        return ( EAttribute ) tLicenseEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getDataObject_UnderlyingType() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -2098,8 +1588,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTLiteral() {
-        return tLiteralEClass;
+    public EAttribute getDataObject_UnderlyingTypeKind() {
+        return ( EAttribute ) dataObjectEClass.getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -2108,8 +1598,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTLiteral_LiteralVal() {
-        return ( EAttribute ) tLiteralEClass.getEStructuralFeatures().get( 0 );
+    public EClass getDataSetMemberOf() {
+        return dataSetMemberOfEClass;
     }
 
     /**
@@ -2118,8 +1608,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTLiteral_Name() {
-        return ( EAttribute ) tLiteralEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getDataSetMemberOf_Cb() {
+        return ( EAttribute ) dataSetMemberOfEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2128,8 +1618,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTLNClass() {
-        return tlnClassEClass;
+    public EClass getDoc() {
+        return docEClass;
     }
 
     /**
@@ -2138,8 +1628,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTLNClass_CanHaveLOG() {
-        return ( EAttribute ) tlnClassEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDoc_Mixed() {
+        return ( EAttribute ) docEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2148,8 +1638,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTLNClass_IsExtension() {
-        return ( EAttribute ) tlnClassEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getDoc_Group() {
+        return ( EAttribute ) docEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2158,8 +1648,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTLNClass_Name() {
-        return ( EAttribute ) tlnClassEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getDoc_Any() {
+        return ( EAttribute ) docEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2168,8 +1658,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTLNClasses() {
-        return tlnClassesEClass;
+    public EAttribute getDoc_Id() {
+        return ( EAttribute ) docEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2178,8 +1668,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTLNClasses_AbstractLNClass() {
-        return ( EReference ) tlnClassesEClass.getEStructuralFeatures().get( 0 );
+    public EClass getDocumentedClass() {
+        return documentedClassEClass;
     }
 
     /**
@@ -2188,8 +1678,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTLNClasses_LNClass() {
-        return ( EReference ) tlnClassesEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getDocumentedClass_Deprecated() {
+        return ( EAttribute ) documentedClassEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2198,8 +1688,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTNotice() {
-        return tNoticeEClass;
+    public EAttribute getDocumentedClass_DescID() {
+        return ( EAttribute ) documentedClassEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2208,8 +1698,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNotice_Mixed() {
-        return ( EAttribute ) tNoticeEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getDocumentedClass_Informative() {
+        return ( EAttribute ) documentedClassEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2218,8 +1708,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTNS() {
-        return tnsEClass;
+    public EClass getEnumeration() {
+        return enumerationEClass;
     }
 
     /**
@@ -2228,8 +1718,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_Changes() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 0 );
+    public EReference getEnumeration_Literal() {
+        return ( EReference ) enumerationEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2238,8 +1728,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_DependsOn() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getEnumeration_InheritedFrom() {
+        return ( EAttribute ) enumerationEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2248,8 +1738,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_BasicTypes() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getEnumeration_Name() {
+        return ( EAttribute ) enumerationEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2258,8 +1748,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_FunctionalConstraints() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 3 );
+    public EClass getEnumerations() {
+        return enumerationsEClass;
     }
 
     /**
@@ -2268,8 +1758,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_PresenceConditions() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 4 );
+    public EReference getEnumerations_Enumeration() {
+        return ( EReference ) enumerationsEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2278,8 +1768,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_Abbreviations() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 5 );
+    public EClass getFunctionalConstraint() {
+        return functionalConstraintEClass;
     }
 
     /**
@@ -2288,8 +1778,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_Enumerations() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 6 );
+    public EReference getFunctionalConstraint_ApplicableServices() {
+        return ( EReference ) functionalConstraintEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2298,8 +1788,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_ConstructedAttributes() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 7 );
+    public EAttribute getFunctionalConstraint_Abbreviation() {
+        return ( EAttribute ) functionalConstraintEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2308,8 +1798,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_CDCs() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 8 );
+    public EAttribute getFunctionalConstraint_DescID() {
+        return ( EAttribute ) functionalConstraintEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2318,8 +1808,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNS_LNClasses() {
-        return ( EReference ) tnsEClass.getEStructuralFeatures().get( 9 );
+    public EAttribute getFunctionalConstraint_TitleID() {
+        return ( EAttribute ) functionalConstraintEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2328,8 +1818,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNS_DescID() {
-        return ( EAttribute ) tnsEClass.getEStructuralFeatures().get( 10 );
+    public EClass getFunctionalConstraints() {
+        return functionalConstraintsEClass;
     }
 
     /**
@@ -2338,8 +1828,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNS_Id() {
-        return ( EAttribute ) tnsEClass.getEStructuralFeatures().get( 11 );
+    public EReference getFunctionalConstraints_FunctionalConstraint() {
+        return ( EReference ) functionalConstraintsEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2348,8 +1838,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNS_PublicationStage() {
-        return ( EAttribute ) tnsEClass.getEStructuralFeatures().get( 12 );
+    public EClass getLicense() {
+        return licenseEClass;
     }
 
     /**
@@ -2358,8 +1848,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNS_Release() {
-        return ( EAttribute ) tnsEClass.getEStructuralFeatures().get( 13 );
+    public EAttribute getLicense_Mixed() {
+        return ( EAttribute ) licenseEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2368,8 +1858,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNS_Revision() {
-        return ( EAttribute ) tnsEClass.getEStructuralFeatures().get( 14 );
+    public EAttribute getLicense_Kind() {
+        return ( EAttribute ) licenseEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2378,8 +1868,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNS_UmlDate() {
-        return ( EAttribute ) tnsEClass.getEStructuralFeatures().get( 15 );
+    public EAttribute getLicense_Uri() {
+        return ( EAttribute ) licenseEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2388,8 +1878,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNS_UmlVersion() {
-        return ( EAttribute ) tnsEClass.getEStructuralFeatures().get( 16 );
+    public EClass getLiteral() {
+        return literalEClass;
     }
 
     /**
@@ -2398,8 +1888,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNS_Version() {
-        return ( EAttribute ) tnsEClass.getEStructuralFeatures().get( 17 );
+    public EAttribute getLiteral_LiteralVal() {
+        return ( EAttribute ) literalEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2408,8 +1898,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTNSDoc() {
-        return tnsDocEClass;
+    public EAttribute getLiteral_Name() {
+        return ( EAttribute ) literalEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2418,8 +1908,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTNSDoc_Doc() {
-        return ( EReference ) tnsDocEClass.getEStructuralFeatures().get( 0 );
+    public EClass getLNClass() {
+        return lnClassEClass;
     }
 
     /**
@@ -2428,8 +1918,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNSDoc_Id() {
-        return ( EAttribute ) tnsDocEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getLNClass_CanHaveLOG() {
+        return ( EAttribute ) lnClassEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2438,8 +1928,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNSDoc_Lang() {
-        return ( EAttribute ) tnsDocEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getLNClass_IsExtension() {
+        return ( EAttribute ) lnClassEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2448,8 +1938,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNSDoc_PublicationStage() {
-        return ( EAttribute ) tnsDocEClass.getEStructuralFeatures().get( 3 );
+    public EAttribute getLNClass_Name() {
+        return ( EAttribute ) lnClassEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2458,8 +1948,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNSDoc_Release() {
-        return ( EAttribute ) tnsDocEClass.getEStructuralFeatures().get( 4 );
+    public EClass getLNClasses() {
+        return lnClassesEClass;
     }
 
     /**
@@ -2468,8 +1958,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNSDoc_Revision() {
-        return ( EAttribute ) tnsDocEClass.getEStructuralFeatures().get( 5 );
+    public EReference getLNClasses_AbstractLNClass() {
+        return ( EReference ) lnClassesEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2478,8 +1968,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNSDoc_UmlDate() {
-        return ( EAttribute ) tnsDocEClass.getEStructuralFeatures().get( 6 );
+    public EReference getLNClasses_LNClass() {
+        return ( EReference ) lnClassesEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2488,8 +1978,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNSDoc_UmlVersion() {
-        return ( EAttribute ) tnsDocEClass.getEStructuralFeatures().get( 7 );
+    public EClass getNotice() {
+        return noticeEClass;
     }
 
     /**
@@ -2498,8 +1988,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTNSDoc_Version() {
-        return ( EAttribute ) tnsDocEClass.getEStructuralFeatures().get( 8 );
+    public EAttribute getNotice_Mixed() {
+        return ( EAttribute ) noticeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2508,8 +1998,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTPresenceCondition() {
-        return tPresenceConditionEClass;
+    public EClass getNS() {
+        return nsEClass;
     }
 
     /**
@@ -2518,8 +2008,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTPresenceCondition_Argument() {
-        return ( EAttribute ) tPresenceConditionEClass.getEStructuralFeatures().get( 0 );
+    public EReference getNS_Changes() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2528,8 +2018,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTPresenceCondition_DescID() {
-        return ( EAttribute ) tPresenceConditionEClass.getEStructuralFeatures().get( 1 );
+    public EReference getNS_DependsOn() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2538,8 +2028,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTPresenceCondition_Name() {
-        return ( EAttribute ) tPresenceConditionEClass.getEStructuralFeatures().get( 2 );
+    public EReference getNS_BasicTypes() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2548,8 +2038,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTPresenceCondition_TitleID() {
-        return ( EAttribute ) tPresenceConditionEClass.getEStructuralFeatures().get( 3 );
+    public EReference getNS_FunctionalConstraints() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2558,8 +2048,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTPresenceConditions() {
-        return tPresenceConditionsEClass;
+    public EReference getNS_PresenceConditions() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -2568,8 +2058,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTPresenceConditions_PresenceCondition() {
-        return ( EReference ) tPresenceConditionsEClass.getEStructuralFeatures().get( 0 );
+    public EReference getNS_Abbreviations() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -2578,8 +2068,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceCDC() {
-        return tServiceCDCEClass;
+    public EReference getNS_Enumerations() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -2588,8 +2078,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceCDC_ServiceDataAttribute() {
-        return ( EReference ) tServiceCDCEClass.getEStructuralFeatures().get( 0 );
+    public EReference getNS_ConstructedAttributes() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -2598,8 +2088,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceCDC_Cdc() {
-        return ( EAttribute ) tServiceCDCEClass.getEStructuralFeatures().get( 1 );
+    public EReference getNS_CDCs() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -2608,8 +2098,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceCDC_Variant() {
-        return ( EAttribute ) tServiceCDCEClass.getEStructuralFeatures().get( 2 );
+    public EReference getNS_LNClasses() {
+        return ( EReference ) nsEClass.getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -2618,8 +2108,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceCDCs() {
-        return tServiceCDCsEClass;
+    public EAttribute getNS_DescID() {
+        return ( EAttribute ) nsEClass.getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -2628,8 +2118,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceCDCs_ServiceCDC() {
-        return ( EReference ) tServiceCDCsEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getNS_Id() {
+        return ( EAttribute ) nsEClass.getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -2638,8 +2128,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceConstructedAttribute() {
-        return tServiceConstructedAttributeEClass;
+    public EAttribute getNS_PublicationStage() {
+        return ( EAttribute ) nsEClass.getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -2648,8 +2138,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceConstructedAttribute_TypeKindParameterized() {
-        return ( EAttribute ) tServiceConstructedAttributeEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getNS_Revision() {
+        return ( EAttribute ) nsEClass.getEStructuralFeatures().get( 13 );
     }
 
     /**
@@ -2658,8 +2148,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceConstructedAttributes() {
-        return tServiceConstructedAttributesEClass;
+    public EAttribute getNS_UmlDate() {
+        return ( EAttribute ) nsEClass.getEStructuralFeatures().get( 14 );
     }
 
     /**
@@ -2668,8 +2158,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceConstructedAttributes_ServiceConstructedAttribute() {
-        return ( EReference ) tServiceConstructedAttributesEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getNS_UmlVersion() {
+        return ( EAttribute ) nsEClass.getEStructuralFeatures().get( 15 );
     }
 
     /**
@@ -2678,8 +2168,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceDataAttribute() {
-        return tServiceDataAttributeEClass;
+    public EClass getNSDoc() {
+        return nsDocEClass;
     }
 
     /**
@@ -2688,8 +2178,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceDataAttribute_Fc() {
-        return ( EAttribute ) tServiceDataAttributeEClass.getEStructuralFeatures().get( 0 );
+    public EReference getNSDoc_Doc() {
+        return ( EReference ) nsDocEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2698,8 +2188,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceDataAttribute_Name() {
-        return ( EAttribute ) tServiceDataAttributeEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getNSDoc_Id() {
+        return ( EAttribute ) nsDocEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2708,8 +2198,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceDataAttribute_PresCond() {
-        return ( EAttribute ) tServiceDataAttributeEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getNSDoc_Lang() {
+        return ( EAttribute ) nsDocEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2718,8 +2208,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceDataAttribute_PresCondArgs() {
-        return ( EAttribute ) tServiceDataAttributeEClass.getEStructuralFeatures().get( 3 );
+    public EAttribute getNSDoc_PublicationStage() {
+        return ( EAttribute ) nsDocEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2728,8 +2218,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceDataAttribute_PresCondArgsID() {
-        return ( EAttribute ) tServiceDataAttributeEClass.getEStructuralFeatures().get( 4 );
+    public EAttribute getNSDoc_Revision() {
+        return ( EAttribute ) nsDocEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -2738,8 +2228,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceDataAttribute_Type() {
-        return ( EAttribute ) tServiceDataAttributeEClass.getEStructuralFeatures().get( 5 );
+    public EAttribute getNSDoc_UmlDate() {
+        return ( EAttribute ) nsDocEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -2748,8 +2238,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceDataAttribute_TypeKind() {
-        return ( EAttribute ) tServiceDataAttributeEClass.getEStructuralFeatures().get( 6 );
+    public EAttribute getNSDoc_UmlVersion() {
+        return ( EAttribute ) nsDocEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -2758,8 +2248,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceDataAttribute_UnderlyingType() {
-        return ( EAttribute ) tServiceDataAttributeEClass.getEStructuralFeatures().get( 7 );
+    public EClass getPresenceCondition() {
+        return presenceConditionEClass;
     }
 
     /**
@@ -2768,8 +2258,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceDataAttribute_UnderlyingTypeKind() {
-        return ( EAttribute ) tServiceDataAttributeEClass.getEStructuralFeatures().get( 8 );
+    public EAttribute getPresenceCondition_Argument() {
+        return ( EAttribute ) presenceConditionEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2778,8 +2268,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceNS() {
-        return tServiceNSEClass;
+    public EAttribute getPresenceCondition_DescID() {
+        return ( EAttribute ) presenceConditionEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2788,8 +2278,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceNS_Changes() {
-        return ( EReference ) tServiceNSEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getPresenceCondition_Name() {
+        return ( EAttribute ) presenceConditionEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2798,8 +2288,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceNS_FunctionalConstraints() {
-        return ( EReference ) tServiceNSEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getPresenceCondition_TitleID() {
+        return ( EAttribute ) presenceConditionEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2808,8 +2298,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceNS_PresenceConditions() {
-        return ( EReference ) tServiceNSEClass.getEStructuralFeatures().get( 2 );
+    public EClass getPresenceConditions() {
+        return presenceConditionsEClass;
     }
 
     /**
@@ -2818,8 +2308,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceNS_Abbreviations() {
-        return ( EReference ) tServiceNSEClass.getEStructuralFeatures().get( 3 );
+    public EReference getPresenceConditions_PresenceCondition() {
+        return ( EReference ) presenceConditionsEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2828,8 +2318,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceNS_ServiceTypeRealizations() {
-        return ( EReference ) tServiceNSEClass.getEStructuralFeatures().get( 4 );
+    public EClass getServiceCDC() {
+        return serviceCDCEClass;
     }
 
     /**
@@ -2838,8 +2328,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceNS_ServiceConstructedAttributes() {
-        return ( EReference ) tServiceNSEClass.getEStructuralFeatures().get( 5 );
+    public EReference getServiceCDC_ServiceDataAttribute() {
+        return ( EReference ) serviceCDCEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2848,8 +2338,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceNS_ServiceCDCs() {
-        return ( EReference ) tServiceNSEClass.getEStructuralFeatures().get( 6 );
+    public EAttribute getServiceCDC_Cdc() {
+        return ( EAttribute ) serviceCDCEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2858,8 +2348,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNS_DescID() {
-        return ( EAttribute ) tServiceNSEClass.getEStructuralFeatures().get( 7 );
+    public EAttribute getServiceCDC_Variant() {
+        return ( EAttribute ) serviceCDCEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2868,8 +2358,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNS_Id() {
-        return ( EAttribute ) tServiceNSEClass.getEStructuralFeatures().get( 8 );
+    public EClass getServiceCDCs() {
+        return serviceCDCsEClass;
     }
 
     /**
@@ -2878,8 +2368,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNS_PublicationStage() {
-        return ( EAttribute ) tServiceNSEClass.getEStructuralFeatures().get( 9 );
+    public EReference getServiceCDCs_ServiceCDC() {
+        return ( EReference ) serviceCDCsEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2888,8 +2378,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNS_Release() {
-        return ( EAttribute ) tServiceNSEClass.getEStructuralFeatures().get( 10 );
+    public EClass getServiceConstructedAttribute() {
+        return serviceConstructedAttributeEClass;
     }
 
     /**
@@ -2898,8 +2388,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNS_Revision() {
-        return ( EAttribute ) tServiceNSEClass.getEStructuralFeatures().get( 11 );
+    public EAttribute getServiceConstructedAttribute_TypeKindParameterized() {
+        return ( EAttribute ) serviceConstructedAttributeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2908,8 +2398,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNS_UmlDate() {
-        return ( EAttribute ) tServiceNSEClass.getEStructuralFeatures().get( 12 );
+    public EClass getServiceConstructedAttributes() {
+        return serviceConstructedAttributesEClass;
     }
 
     /**
@@ -2918,8 +2408,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNS_UmlVersion() {
-        return ( EAttribute ) tServiceNSEClass.getEStructuralFeatures().get( 13 );
+    public EReference getServiceConstructedAttributes_ServiceConstructedAttribute() {
+        return ( EReference ) serviceConstructedAttributesEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2928,8 +2418,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNS_Version() {
-        return ( EAttribute ) tServiceNSEClass.getEStructuralFeatures().get( 14 );
+    public EClass getServiceDataAttribute() {
+        return serviceDataAttributeEClass;
     }
 
     /**
@@ -2938,8 +2428,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceNsUsage() {
-        return tServiceNsUsageEClass;
+    public EAttribute getServiceDataAttribute_Fc() {
+        return ( EAttribute ) serviceDataAttributeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2948,8 +2438,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceNsUsage_AppliesTo() {
-        return ( EReference ) tServiceNsUsageEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getServiceDataAttribute_Name() {
+        return ( EAttribute ) serviceDataAttributeEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2958,8 +2448,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNsUsage_Id() {
-        return ( EAttribute ) tServiceNsUsageEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getServiceDataAttribute_PresCond() {
+        return ( EAttribute ) serviceDataAttributeEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2968,8 +2458,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNsUsage_PublicationStage() {
-        return ( EAttribute ) tServiceNsUsageEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getServiceDataAttribute_PresCondArgs() {
+        return ( EAttribute ) serviceDataAttributeEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2978,8 +2468,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNsUsage_Release() {
-        return ( EAttribute ) tServiceNsUsageEClass.getEStructuralFeatures().get( 3 );
+    public EAttribute getServiceDataAttribute_PresCondArgsID() {
+        return ( EAttribute ) serviceDataAttributeEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -2988,8 +2478,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNsUsage_Revision() {
-        return ( EAttribute ) tServiceNsUsageEClass.getEStructuralFeatures().get( 4 );
+    public EAttribute getServiceDataAttribute_Type() {
+        return ( EAttribute ) serviceDataAttributeEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -2998,8 +2488,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceNsUsage_Version() {
-        return ( EAttribute ) tServiceNsUsageEClass.getEStructuralFeatures().get( 5 );
+    public EAttribute getServiceDataAttribute_TypeKind() {
+        return ( EAttribute ) serviceDataAttributeEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -3008,8 +2498,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceParameter() {
-        return tServiceParameterEClass;
+    public EAttribute getServiceDataAttribute_UnderlyingType() {
+        return ( EAttribute ) serviceDataAttributeEClass.getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -3018,8 +2508,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceParameter_DefaultValue() {
-        return ( EAttribute ) tServiceParameterEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getServiceDataAttribute_UnderlyingTypeKind() {
+        return ( EAttribute ) serviceDataAttributeEClass.getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -3028,8 +2518,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceParameter_MaxValue() {
-        return ( EAttribute ) tServiceParameterEClass.getEStructuralFeatures().get( 1 );
+    public EClass getServiceNS() {
+        return serviceNSEClass;
     }
 
     /**
@@ -3038,8 +2528,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceParameter_MinValue() {
-        return ( EAttribute ) tServiceParameterEClass.getEStructuralFeatures().get( 2 );
+    public EReference getServiceNS_Changes() {
+        return ( EReference ) serviceNSEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3048,8 +2538,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceParameter_Name() {
-        return ( EAttribute ) tServiceParameterEClass.getEStructuralFeatures().get( 3 );
+    public EReference getServiceNS_FunctionalConstraints() {
+        return ( EReference ) serviceNSEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3058,8 +2548,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceParameter_Type() {
-        return ( EAttribute ) tServiceParameterEClass.getEStructuralFeatures().get( 4 );
+    public EReference getServiceNS_PresenceConditions() {
+        return ( EReference ) serviceNSEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3068,8 +2558,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceParameter_TypeKind() {
-        return ( EAttribute ) tServiceParameterEClass.getEStructuralFeatures().get( 5 );
+    public EReference getServiceNS_Abbreviations() {
+        return ( EReference ) serviceNSEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3078,8 +2568,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceTypeRealization() {
-        return tServiceTypeRealizationEClass;
+    public EReference getServiceNS_ServiceTypeRealizations() {
+        return ( EReference ) serviceNSEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3088,8 +2578,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceTypeRealization_Fc() {
-        return ( EAttribute ) tServiceTypeRealizationEClass.getEStructuralFeatures().get( 0 );
+    public EReference getServiceNS_ServiceConstructedAttributes() {
+        return ( EReference ) serviceNSEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -3098,8 +2588,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceTypeRealization_Name() {
-        return ( EAttribute ) tServiceTypeRealizationEClass.getEStructuralFeatures().get( 1 );
+    public EReference getServiceNS_ServiceCDCs() {
+        return ( EReference ) serviceNSEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -3108,8 +2598,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceTypeRealization_PresCond() {
-        return ( EAttribute ) tServiceTypeRealizationEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getServiceNS_DescID() {
+        return ( EAttribute ) serviceNSEClass.getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -3118,8 +2608,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceTypeRealization_PresCondArgs() {
-        return ( EAttribute ) tServiceTypeRealizationEClass.getEStructuralFeatures().get( 3 );
+    public EAttribute getServiceNS_Id() {
+        return ( EAttribute ) serviceNSEClass.getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -3128,8 +2618,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceTypeRealization_PresCondArgsID() {
-        return ( EAttribute ) tServiceTypeRealizationEClass.getEStructuralFeatures().get( 4 );
+    public EAttribute getServiceNS_PublicationStage() {
+        return ( EAttribute ) serviceNSEClass.getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -3138,8 +2628,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceTypeRealization_Type() {
-        return ( EAttribute ) tServiceTypeRealizationEClass.getEStructuralFeatures().get( 5 );
+    public EAttribute getServiceNS_Revision() {
+        return ( EAttribute ) serviceNSEClass.getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -3148,8 +2638,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTServiceTypeRealization_TypeKind() {
-        return ( EAttribute ) tServiceTypeRealizationEClass.getEStructuralFeatures().get( 6 );
+    public EAttribute getServiceNS_UmlDate() {
+        return ( EAttribute ) serviceNSEClass.getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -3158,8 +2648,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTServiceTypeRealizations() {
-        return tServiceTypeRealizationsEClass;
+    public EAttribute getServiceNS_UmlVersion() {
+        return ( EAttribute ) serviceNSEClass.getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -3168,8 +2658,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EReference getTServiceTypeRealizations_ServiceTypeRealization() {
-        return ( EReference ) tServiceTypeRealizationsEClass.getEStructuralFeatures().get( 0 );
+    public EClass getServiceNsUsage() {
+        return serviceNsUsageEClass;
     }
 
     /**
@@ -3178,8 +2668,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTSubDataAttribute() {
-        return tSubDataAttributeEClass;
+    public EReference getServiceNsUsage_AppliesTo() {
+        return ( EReference ) serviceNsUsageEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3188,8 +2678,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_DefaultValue() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getServiceNsUsage_Id() {
+        return ( EAttribute ) serviceNsUsageEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3198,8 +2688,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_IsArray() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getServiceNsUsage_PublicationStage() {
+        return ( EAttribute ) serviceNsUsageEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3208,8 +2698,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_MaxIndexAttribute() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getServiceNsUsage_Revision() {
+        return ( EAttribute ) serviceNsUsageEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3218,8 +2708,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_MaxValue() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 3 );
+    public EClass getServiceParameter() {
+        return serviceParameterEClass;
     }
 
     /**
@@ -3228,8 +2718,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_MinIndex() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 4 );
+    public EAttribute getServiceParameter_DefaultValue() {
+        return ( EAttribute ) serviceParameterEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3238,8 +2728,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_MinValue() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 5 );
+    public EAttribute getServiceParameter_MaxValue() {
+        return ( EAttribute ) serviceParameterEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3248,8 +2738,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_Name() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 6 );
+    public EAttribute getServiceParameter_MinValue() {
+        return ( EAttribute ) serviceParameterEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3258,8 +2748,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_PresCond() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 7 );
+    public EAttribute getServiceParameter_Name() {
+        return ( EAttribute ) serviceParameterEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3268,8 +2758,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_PresCondArgs() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 8 );
+    public EAttribute getServiceParameter_Type() {
+        return ( EAttribute ) serviceParameterEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3278,8 +2768,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_PresCondArgsID() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 9 );
+    public EAttribute getServiceParameter_TypeKind() {
+        return ( EAttribute ) serviceParameterEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -3288,8 +2778,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_SizeAttribute() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 10 );
+    public EClass getServiceTypeRealization() {
+        return serviceTypeRealizationEClass;
     }
 
     /**
@@ -3298,8 +2788,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_Type() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 11 );
+    public EAttribute getServiceTypeRealization_Fc() {
+        return ( EAttribute ) serviceTypeRealizationEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3308,8 +2798,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataAttribute_TypeKind() {
-        return ( EAttribute ) tSubDataAttributeEClass.getEStructuralFeatures().get( 12 );
+    public EAttribute getServiceTypeRealization_Name() {
+        return ( EAttribute ) serviceTypeRealizationEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3318,8 +2808,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTSubDataObject() {
-        return tSubDataObjectEClass;
+    public EAttribute getServiceTypeRealization_PresCond() {
+        return ( EAttribute ) serviceTypeRealizationEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3328,8 +2818,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_IsArray() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getServiceTypeRealization_PresCondArgs() {
+        return ( EAttribute ) serviceTypeRealizationEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3338,8 +2828,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_MaxIndexAttribute() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 1 );
+    public EAttribute getServiceTypeRealization_PresCondArgsID() {
+        return ( EAttribute ) serviceTypeRealizationEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3348,8 +2838,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_MinIndex() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 2 );
+    public EAttribute getServiceTypeRealization_Type() {
+        return ( EAttribute ) serviceTypeRealizationEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -3358,8 +2848,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_Name() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 3 );
+    public EAttribute getServiceTypeRealization_TypeKind() {
+        return ( EAttribute ) serviceTypeRealizationEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -3368,8 +2858,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_PresCond() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 4 );
+    public EClass getServiceTypeRealizations() {
+        return serviceTypeRealizationsEClass;
     }
 
     /**
@@ -3378,8 +2868,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_PresCondArgs() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 5 );
+    public EReference getServiceTypeRealizations_ServiceTypeRealization() {
+        return ( EReference ) serviceTypeRealizationsEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3388,8 +2878,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_PresCondArgsID() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 6 );
+    public EClass getSubDataAttribute() {
+        return subDataAttributeEClass;
     }
 
     /**
@@ -3398,8 +2888,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_SizeAttribute() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 7 );
+    public EAttribute getSubDataAttribute_DefaultValue() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3408,8 +2898,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_Type() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 8 );
+    public EAttribute getSubDataAttribute_IsArray() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3418,8 +2908,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_UnderlyingType() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 9 );
+    public EAttribute getSubDataAttribute_MaxIndexAttribute() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3428,8 +2918,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTSubDataObject_UnderlyingTypeKind() {
-        return ( EAttribute ) tSubDataObjectEClass.getEStructuralFeatures().get( 10 );
+    public EAttribute getSubDataAttribute_MaxValue() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3438,8 +2928,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EClass getTTitledClass() {
-        return tTitledClassEClass;
+    public EAttribute getSubDataAttribute_MinIndex() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3448,8 +2938,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EAttribute getTTitledClass_TitleID() {
-        return ( EAttribute ) tTitledClassEClass.getEStructuralFeatures().get( 0 );
+    public EAttribute getSubDataAttribute_MinValue() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -3458,8 +2948,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EEnum getTACSIServicesKind() {
-        return tacsiServicesKindEEnum;
+    public EAttribute getSubDataAttribute_Name() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -3468,8 +2958,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EEnum getTCBKind() {
-        return tcbKindEEnum;
+    public EAttribute getSubDataAttribute_PresCond() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -3478,8 +2968,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EEnum getTDefinedAttributeTypeKind() {
-        return tDefinedAttributeTypeKindEEnum;
+    public EAttribute getSubDataAttribute_PresCondArgs() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -3488,8 +2978,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EEnum getTLicenseKind() {
-        return tLicenseKindEEnum;
+    public EAttribute getSubDataAttribute_PresCondArgsID() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -3498,8 +2988,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EEnum getTPubStage() {
-        return tPubStageEEnum;
+    public EAttribute getSubDataAttribute_SizeAttribute() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -3508,8 +2998,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EEnum getTUndefinedAttributeTypeKind() {
-        return tUndefinedAttributeTypeKindEEnum;
+    public EAttribute getSubDataAttribute_Type() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -3518,8 +3008,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTAbbreviationName() {
-        return tAbbreviationNameEDataType;
+    public EAttribute getSubDataAttribute_TypeKind() {
+        return ( EAttribute ) subDataAttributeEClass.getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -3528,8 +3018,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTAbstractLNClassName() {
-        return tAbstractLNClassNameEDataType;
+    public EClass getSubDataObject() {
+        return subDataObjectEClass;
     }
 
     /**
@@ -3538,8 +3028,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTACSIServicesKindObject() {
-        return tacsiServicesKindObjectEDataType;
+    public EAttribute getSubDataObject_IsArray() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3548,8 +3038,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTAttributeName() {
-        return tAttributeNameEDataType;
+    public EAttribute getSubDataObject_MaxIndexAttribute() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3558,8 +3048,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTAttributeTypeKind() {
-        return tAttributeTypeKindEDataType;
+    public EAttribute getSubDataObject_MinIndex() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3568,8 +3058,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTBasicTypeName() {
-        return tBasicTypeNameEDataType;
+    public EAttribute getSubDataObject_Name() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3578,8 +3068,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTCBKindObject() {
-        return tcbKindObjectEDataType;
+    public EAttribute getSubDataObject_PresCond() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3588,8 +3078,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTCDCName() {
-        return tcdcNameEDataType;
+    public EAttribute getSubDataObject_PresCondArgs() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -3598,8 +3088,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTDataObjectName() {
-        return tDataObjectNameEDataType;
+    public EAttribute getSubDataObject_PresCondArgsID() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -3608,8 +3098,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTDefinedAttributeTypeKindObject() {
-        return tDefinedAttributeTypeKindObjectEDataType;
+    public EAttribute getSubDataObject_SizeAttribute() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -3618,8 +3108,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTDocID() {
-        return tDocIDEDataType;
+    public EAttribute getSubDataObject_Type() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -3628,8 +3118,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTEmptyString() {
-        return tEmptyStringEDataType;
+    public EAttribute getSubDataObject_UnderlyingType() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -3638,8 +3128,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTFCAbbreviation() {
-        return tfcAbbreviationEDataType;
+    public EAttribute getSubDataObject_UnderlyingTypeKind() {
+        return ( EAttribute ) subDataObjectEClass.getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -3648,8 +3138,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTIec61850Name() {
-        return tIec61850NameEDataType;
+    public EClass getTitledClass() {
+        return titledClassEClass;
     }
 
     /**
@@ -3658,8 +3148,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTIec61850NameString() {
-        return tIec61850NameStringEDataType;
+    public EAttribute getTitledClass_TitleID() {
+        return ( EAttribute ) titledClassEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3668,8 +3158,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTissuesType() {
-        return tissuesTypeEDataType;
+    public EClass getNSDObjectWithVersionAndRelease() {
+        return nsdObjectWithVersionAndReleaseEClass;
     }
 
     /**
@@ -3678,8 +3168,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTLicenseKindObject() {
-        return tLicenseKindObjectEDataType;
+    public EAttribute getNSDObjectWithVersionAndRelease_Release() {
+        return ( EAttribute ) nsdObjectWithVersionAndReleaseEClass.getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3688,8 +3178,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTLiteralName() {
-        return tLiteralNameEDataType;
+    public EAttribute getNSDObjectWithVersionAndRelease_Version() {
+        return ( EAttribute ) nsdObjectWithVersionAndReleaseEClass.getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3698,8 +3188,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTLNClassName() {
-        return tlnClassNameEDataType;
+    public EEnum getACSIServicesKind() {
+        return acsiServicesKindEEnum;
     }
 
     /**
@@ -3708,8 +3198,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTNSIdentifier() {
-        return tnsIdentifierEDataType;
+    public EEnum getCBKind() {
+        return cbKindEEnum;
     }
 
     /**
@@ -3718,8 +3208,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTNSRelease() {
-        return tnsReleaseEDataType;
+    public EEnum getDefinedAttributeTypeKind() {
+        return definedAttributeTypeKindEEnum;
     }
 
     /**
@@ -3728,8 +3218,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTNSReleaseObject() {
-        return tnsReleaseObjectEDataType;
+    public EEnum getLicenseKind() {
+        return licenseKindEEnum;
     }
 
     /**
@@ -3738,8 +3228,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTNSRevision() {
-        return tnsRevisionEDataType;
+    public EEnum getPubStage() {
+        return pubStageEEnum;
     }
 
     /**
@@ -3748,8 +3238,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTNSVersion() {
-        return tnsVersionEDataType;
+    public EEnum getUndefinedAttributeTypeKind() {
+        return undefinedAttributeTypeKindEEnum;
     }
 
     /**
@@ -3758,8 +3248,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTNSVersionObject() {
-        return tnsVersionObjectEDataType;
+    public EDataType getACSIServicesKindObject() {
+        return acsiServicesKindObjectEDataType;
     }
 
     /**
@@ -3768,8 +3258,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTPresenceConditionArgument() {
-        return tPresenceConditionArgumentEDataType;
+    public EDataType getAttributeTypeKind() {
+        return attributeTypeKindEDataType;
     }
 
     /**
@@ -3778,8 +3268,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTPresenceConditionName() {
-        return tPresenceConditionNameEDataType;
+    public EDataType getCBKindObject() {
+        return cbKindObjectEDataType;
     }
 
     /**
@@ -3788,8 +3278,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTPubStageObject() {
-        return tPubStageObjectEDataType;
+    public EDataType getDefinedAttributeTypeKindObject() {
+        return definedAttributeTypeKindObjectEDataType;
     }
 
     /**
@@ -3798,8 +3288,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTSubDataObjectName() {
-        return tSubDataObjectNameEDataType;
+    public EDataType getLicenseKindObject() {
+        return licenseKindObjectEDataType;
     }
 
     /**
@@ -3808,8 +3298,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTUMLVersion() {
-        return tumlVersionEDataType;
+    public EDataType getPubStageObject() {
+        return pubStageObjectEDataType;
     }
 
     /**
@@ -3818,8 +3308,8 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
      * @generated
      */
     @Override
-    public EDataType getTUndefinedAttributeTypeKindObject() {
-        return tUndefinedAttributeTypeKindObjectEDataType;
+    public EDataType getUndefinedAttributeTypeKindObject() {
+        return undefinedAttributeTypeKindObjectEDataType;
     }
 
     /**
@@ -3854,16 +3344,12 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
         appliesToTypeEClass = createEClass( APPLIES_TO_TYPE );
         createEAttribute( appliesToTypeEClass, APPLIES_TO_TYPE__ID );
         createEAttribute( appliesToTypeEClass, APPLIES_TO_TYPE__PUBLICATION_STAGE );
-        createEAttribute( appliesToTypeEClass, APPLIES_TO_TYPE__RELEASE );
         createEAttribute( appliesToTypeEClass, APPLIES_TO_TYPE__REVISION );
-        createEAttribute( appliesToTypeEClass, APPLIES_TO_TYPE__VERSION );
 
         dependsOnTypeEClass = createEClass( DEPENDS_ON_TYPE );
         createEAttribute( dependsOnTypeEClass, DEPENDS_ON_TYPE__ID );
         createEAttribute( dependsOnTypeEClass, DEPENDS_ON_TYPE__PUBLICATION_STAGE );
-        createEAttribute( dependsOnTypeEClass, DEPENDS_ON_TYPE__RELEASE );
         createEAttribute( dependsOnTypeEClass, DEPENDS_ON_TYPE__REVISION );
-        createEAttribute( dependsOnTypeEClass, DEPENDS_ON_TYPE__VERSION );
 
         documentRootEClass = createEClass( DOCUMENT_ROOT );
         createEAttribute( documentRootEClass, DOCUMENT_ROOT__MIXED );
@@ -3878,337 +3364,307 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
         serviceTypeEClass = createEClass( SERVICE_TYPE );
         createEAttribute( serviceTypeEClass, SERVICE_TYPE__NAME );
 
-        tAbbreviationEClass = createEClass( TABBREVIATION );
-        createEAttribute( tAbbreviationEClass, TABBREVIATION__DESC_ID );
-        createEAttribute( tAbbreviationEClass, TABBREVIATION__NAME );
-
-        tAbbreviationsEClass = createEClass( TABBREVIATIONS );
-        createEReference( tAbbreviationsEClass, TABBREVIATIONS__ABBREVIATION );
-
-        tAbstractLNClassEClass = createEClass( TABSTRACT_LN_CLASS );
-        createEAttribute( tAbstractLNClassEClass, TABSTRACT_LN_CLASS__NAME );
-
-        tAnyLNClassEClass = createEClass( TANY_LN_CLASS );
-        createEReference( tAnyLNClassEClass, TANY_LN_CLASS__DATA_OBJECT );
-        createEAttribute( tAnyLNClassEClass, TANY_LN_CLASS__BASE );
-
-        tApplicableServiceNSEClass = createEClass( TAPPLICABLE_SERVICE_NS );
-        createEReference( tApplicableServiceNSEClass, TAPPLICABLE_SERVICE_NS__SERVICE_NS_USAGE );
-        createEAttribute( tApplicableServiceNSEClass, TAPPLICABLE_SERVICE_NS__DATE );
-        createEAttribute( tApplicableServiceNSEClass, TAPPLICABLE_SERVICE_NS__VERSION );
-
-        tApplicableServicesEClass = createEClass( TAPPLICABLE_SERVICES );
-        createEReference( tApplicableServicesEClass, TAPPLICABLE_SERVICES__SERVICE );
-        createEReference( tApplicableServicesEClass, TAPPLICABLE_SERVICES__DATA_SET_MEMBER_OF );
-
-        tBasicTypeEClass = createEClass( TBASIC_TYPE );
-        createEAttribute( tBasicTypeEClass, TBASIC_TYPE__DESC_ID );
-        createEAttribute( tBasicTypeEClass, TBASIC_TYPE__NAME );
-
-        tBasicTypesEClass = createEClass( TBASIC_TYPES );
-        createEReference( tBasicTypesEClass, TBASIC_TYPES__BASIC_TYPE );
-
-        tcdcEClass = createEClass( TCDC );
-        createEReference( tcdcEClass, TCDC__SUB_DATA_OBJECT );
-        createEReference( tcdcEClass, TCDC__DATA_ATTRIBUTE );
-        createEReference( tcdcEClass, TCDC__SERVICE_PARAMETER );
-        createEAttribute( tcdcEClass, TCDC__ENUM_PARAMETERIZED );
-        createEAttribute( tcdcEClass, TCDC__NAME );
-        createEAttribute( tcdcEClass, TCDC__STATISTICS );
-        createEAttribute( tcdcEClass, TCDC__TYPE_KIND_PARAMETERIZED );
-        createEAttribute( tcdcEClass, TCDC__VARIANT );
-
-        tcdCsEClass = createEClass( TCD_CS );
-        createEReference( tcdCsEClass, TCD_CS__CDC );
-
-        tChangesEClass = createEClass( TCHANGES );
-        createEAttribute( tChangesEClass, TCHANGES__CHANGES_ID );
-        createEAttribute( tChangesEClass, TCHANGES__DATE );
-        createEAttribute( tChangesEClass, TCHANGES__RELEASE );
-        createEAttribute( tChangesEClass, TCHANGES__REVISION );
-        createEAttribute( tChangesEClass, TCHANGES__TISSUES );
-        createEAttribute( tChangesEClass, TCHANGES__VERSION );
-
-        tConstructedAttributeEClass = createEClass( TCONSTRUCTED_ATTRIBUTE );
-        createEReference( tConstructedAttributeEClass, TCONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE );
-        createEAttribute( tConstructedAttributeEClass, TCONSTRUCTED_ATTRIBUTE__NAME );
-
-        tConstructedAttributesEClass = createEClass( TCONSTRUCTED_ATTRIBUTES );
-        createEReference( tConstructedAttributesEClass, TCONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE );
-
-        tCopyrightedEClass = createEClass( TCOPYRIGHTED );
-        createEReference( tCopyrightedEClass, TCOPYRIGHTED__COPYRIGHT );
-
-        tCopyrightNoticeEClass = createEClass( TCOPYRIGHT_NOTICE );
-        createEReference( tCopyrightNoticeEClass, TCOPYRIGHT_NOTICE__NOTICE );
-        createEReference( tCopyrightNoticeEClass, TCOPYRIGHT_NOTICE__LICENSE );
-
-        tDataAttributeEClass = createEClass( TDATA_ATTRIBUTE );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__DCHG );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__DEFAULT_VALUE );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__DUPD );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__FC );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__IS_ARRAY );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__MAX_VALUE );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__MIN_INDEX );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__MIN_VALUE );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__NAME );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__PRES_COND );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__PRES_COND_ARGS );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__PRES_COND_ARGS_ID );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__QCHG );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__SIZE_ATTRIBUTE );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__TYPE );
-        createEAttribute( tDataAttributeEClass, TDATA_ATTRIBUTE__TYPE_KIND );
-
-        tDataObjectEClass = createEClass( TDATA_OBJECT );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__DS_PRES_COND );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__DS_PRES_COND_ARGS );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__DS_PRES_COND_ARGS_ID );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__NAME );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__PRES_COND );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__PRES_COND_ARGS );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__PRES_COND_ARGS_ID );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__TRANSIENT );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__TYPE );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__UNDERLYING_TYPE );
-        createEAttribute( tDataObjectEClass, TDATA_OBJECT__UNDERLYING_TYPE_KIND );
-
-        tDataSetMemberOfEClass = createEClass( TDATA_SET_MEMBER_OF );
-        createEAttribute( tDataSetMemberOfEClass, TDATA_SET_MEMBER_OF__CB );
-
-        tDocEClass = createEClass( TDOC );
-        createEAttribute( tDocEClass, TDOC__MIXED );
-        createEAttribute( tDocEClass, TDOC__GROUP );
-        createEAttribute( tDocEClass, TDOC__ANY );
-        createEAttribute( tDocEClass, TDOC__ID );
-
-        tDocumentedClassEClass = createEClass( TDOCUMENTED_CLASS );
-        createEAttribute( tDocumentedClassEClass, TDOCUMENTED_CLASS__DEPRECATED );
-        createEAttribute( tDocumentedClassEClass, TDOCUMENTED_CLASS__DESC_ID );
-        createEAttribute( tDocumentedClassEClass, TDOCUMENTED_CLASS__INFORMATIVE );
-
-        tEnumerationEClass = createEClass( TENUMERATION );
-        createEReference( tEnumerationEClass, TENUMERATION__LITERAL );
-        createEAttribute( tEnumerationEClass, TENUMERATION__INHERITED_FROM );
-        createEAttribute( tEnumerationEClass, TENUMERATION__NAME );
-
-        tEnumerationsEClass = createEClass( TENUMERATIONS );
-        createEReference( tEnumerationsEClass, TENUMERATIONS__ENUMERATION );
-
-        tFunctionalConstraintEClass = createEClass( TFUNCTIONAL_CONSTRAINT );
-        createEReference( tFunctionalConstraintEClass, TFUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES );
-        createEAttribute( tFunctionalConstraintEClass, TFUNCTIONAL_CONSTRAINT__ABBREVIATION );
-        createEAttribute( tFunctionalConstraintEClass, TFUNCTIONAL_CONSTRAINT__DESC_ID );
-        createEAttribute( tFunctionalConstraintEClass, TFUNCTIONAL_CONSTRAINT__TITLE_ID );
-
-        tFunctionalConstraintsEClass = createEClass( TFUNCTIONAL_CONSTRAINTS );
-        createEReference( tFunctionalConstraintsEClass, TFUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT );
-
-        tLicenseEClass = createEClass( TLICENSE );
-        createEAttribute( tLicenseEClass, TLICENSE__MIXED );
-        createEAttribute( tLicenseEClass, TLICENSE__KIND );
-        createEAttribute( tLicenseEClass, TLICENSE__URI );
-
-        tLiteralEClass = createEClass( TLITERAL );
-        createEAttribute( tLiteralEClass, TLITERAL__LITERAL_VAL );
-        createEAttribute( tLiteralEClass, TLITERAL__NAME );
-
-        tlnClassEClass = createEClass( TLN_CLASS );
-        createEAttribute( tlnClassEClass, TLN_CLASS__CAN_HAVE_LOG );
-        createEAttribute( tlnClassEClass, TLN_CLASS__IS_EXTENSION );
-        createEAttribute( tlnClassEClass, TLN_CLASS__NAME );
-
-        tlnClassesEClass = createEClass( TLN_CLASSES );
-        createEReference( tlnClassesEClass, TLN_CLASSES__ABSTRACT_LN_CLASS );
-        createEReference( tlnClassesEClass, TLN_CLASSES__LN_CLASS );
-
-        tNoticeEClass = createEClass( TNOTICE );
-        createEAttribute( tNoticeEClass, TNOTICE__MIXED );
-
-        tnsEClass = createEClass( TNS );
-        createEReference( tnsEClass, TNS__CHANGES );
-        createEReference( tnsEClass, TNS__DEPENDS_ON );
-        createEReference( tnsEClass, TNS__BASIC_TYPES );
-        createEReference( tnsEClass, TNS__FUNCTIONAL_CONSTRAINTS );
-        createEReference( tnsEClass, TNS__PRESENCE_CONDITIONS );
-        createEReference( tnsEClass, TNS__ABBREVIATIONS );
-        createEReference( tnsEClass, TNS__ENUMERATIONS );
-        createEReference( tnsEClass, TNS__CONSTRUCTED_ATTRIBUTES );
-        createEReference( tnsEClass, TNS__CD_CS );
-        createEReference( tnsEClass, TNS__LN_CLASSES );
-        createEAttribute( tnsEClass, TNS__DESC_ID );
-        createEAttribute( tnsEClass, TNS__ID );
-        createEAttribute( tnsEClass, TNS__PUBLICATION_STAGE );
-        createEAttribute( tnsEClass, TNS__RELEASE );
-        createEAttribute( tnsEClass, TNS__REVISION );
-        createEAttribute( tnsEClass, TNS__UML_DATE );
-        createEAttribute( tnsEClass, TNS__UML_VERSION );
-        createEAttribute( tnsEClass, TNS__VERSION );
-
-        tnsDocEClass = createEClass( TNS_DOC );
-        createEReference( tnsDocEClass, TNS_DOC__DOC );
-        createEAttribute( tnsDocEClass, TNS_DOC__ID );
-        createEAttribute( tnsDocEClass, TNS_DOC__LANG );
-        createEAttribute( tnsDocEClass, TNS_DOC__PUBLICATION_STAGE );
-        createEAttribute( tnsDocEClass, TNS_DOC__RELEASE );
-        createEAttribute( tnsDocEClass, TNS_DOC__REVISION );
-        createEAttribute( tnsDocEClass, TNS_DOC__UML_DATE );
-        createEAttribute( tnsDocEClass, TNS_DOC__UML_VERSION );
-        createEAttribute( tnsDocEClass, TNS_DOC__VERSION );
-
-        tPresenceConditionEClass = createEClass( TPRESENCE_CONDITION );
-        createEAttribute( tPresenceConditionEClass, TPRESENCE_CONDITION__ARGUMENT );
-        createEAttribute( tPresenceConditionEClass, TPRESENCE_CONDITION__DESC_ID );
-        createEAttribute( tPresenceConditionEClass, TPRESENCE_CONDITION__NAME );
-        createEAttribute( tPresenceConditionEClass, TPRESENCE_CONDITION__TITLE_ID );
-
-        tPresenceConditionsEClass = createEClass( TPRESENCE_CONDITIONS );
-        createEReference( tPresenceConditionsEClass, TPRESENCE_CONDITIONS__PRESENCE_CONDITION );
-
-        tServiceCDCEClass = createEClass( TSERVICE_CDC );
-        createEReference( tServiceCDCEClass, TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE );
-        createEAttribute( tServiceCDCEClass, TSERVICE_CDC__CDC );
-        createEAttribute( tServiceCDCEClass, TSERVICE_CDC__VARIANT );
-
-        tServiceCDCsEClass = createEClass( TSERVICE_CD_CS );
-        createEReference( tServiceCDCsEClass, TSERVICE_CD_CS__SERVICE_CDC );
-
-        tServiceConstructedAttributeEClass = createEClass( TSERVICE_CONSTRUCTED_ATTRIBUTE );
-        createEAttribute( tServiceConstructedAttributeEClass, TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED );
-
-        tServiceConstructedAttributesEClass = createEClass( TSERVICE_CONSTRUCTED_ATTRIBUTES );
-        createEReference( tServiceConstructedAttributesEClass,
-                TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE );
-
-        tServiceDataAttributeEClass = createEClass( TSERVICE_DATA_ATTRIBUTE );
-        createEAttribute( tServiceDataAttributeEClass, TSERVICE_DATA_ATTRIBUTE__FC );
-        createEAttribute( tServiceDataAttributeEClass, TSERVICE_DATA_ATTRIBUTE__NAME );
-        createEAttribute( tServiceDataAttributeEClass, TSERVICE_DATA_ATTRIBUTE__PRES_COND );
-        createEAttribute( tServiceDataAttributeEClass, TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS );
-        createEAttribute( tServiceDataAttributeEClass, TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID );
-        createEAttribute( tServiceDataAttributeEClass, TSERVICE_DATA_ATTRIBUTE__TYPE );
-        createEAttribute( tServiceDataAttributeEClass, TSERVICE_DATA_ATTRIBUTE__TYPE_KIND );
-        createEAttribute( tServiceDataAttributeEClass, TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE );
-        createEAttribute( tServiceDataAttributeEClass, TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND );
-
-        tServiceNSEClass = createEClass( TSERVICE_NS );
-        createEReference( tServiceNSEClass, TSERVICE_NS__CHANGES );
-        createEReference( tServiceNSEClass, TSERVICE_NS__FUNCTIONAL_CONSTRAINTS );
-        createEReference( tServiceNSEClass, TSERVICE_NS__PRESENCE_CONDITIONS );
-        createEReference( tServiceNSEClass, TSERVICE_NS__ABBREVIATIONS );
-        createEReference( tServiceNSEClass, TSERVICE_NS__SERVICE_TYPE_REALIZATIONS );
-        createEReference( tServiceNSEClass, TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES );
-        createEReference( tServiceNSEClass, TSERVICE_NS__SERVICE_CD_CS );
-        createEAttribute( tServiceNSEClass, TSERVICE_NS__DESC_ID );
-        createEAttribute( tServiceNSEClass, TSERVICE_NS__ID );
-        createEAttribute( tServiceNSEClass, TSERVICE_NS__PUBLICATION_STAGE );
-        createEAttribute( tServiceNSEClass, TSERVICE_NS__RELEASE );
-        createEAttribute( tServiceNSEClass, TSERVICE_NS__REVISION );
-        createEAttribute( tServiceNSEClass, TSERVICE_NS__UML_DATE );
-        createEAttribute( tServiceNSEClass, TSERVICE_NS__UML_VERSION );
-        createEAttribute( tServiceNSEClass, TSERVICE_NS__VERSION );
-
-        tServiceNsUsageEClass = createEClass( TSERVICE_NS_USAGE );
-        createEReference( tServiceNsUsageEClass, TSERVICE_NS_USAGE__APPLIES_TO );
-        createEAttribute( tServiceNsUsageEClass, TSERVICE_NS_USAGE__ID );
-        createEAttribute( tServiceNsUsageEClass, TSERVICE_NS_USAGE__PUBLICATION_STAGE );
-        createEAttribute( tServiceNsUsageEClass, TSERVICE_NS_USAGE__RELEASE );
-        createEAttribute( tServiceNsUsageEClass, TSERVICE_NS_USAGE__REVISION );
-        createEAttribute( tServiceNsUsageEClass, TSERVICE_NS_USAGE__VERSION );
-
-        tServiceParameterEClass = createEClass( TSERVICE_PARAMETER );
-        createEAttribute( tServiceParameterEClass, TSERVICE_PARAMETER__DEFAULT_VALUE );
-        createEAttribute( tServiceParameterEClass, TSERVICE_PARAMETER__MAX_VALUE );
-        createEAttribute( tServiceParameterEClass, TSERVICE_PARAMETER__MIN_VALUE );
-        createEAttribute( tServiceParameterEClass, TSERVICE_PARAMETER__NAME );
-        createEAttribute( tServiceParameterEClass, TSERVICE_PARAMETER__TYPE );
-        createEAttribute( tServiceParameterEClass, TSERVICE_PARAMETER__TYPE_KIND );
-
-        tServiceTypeRealizationEClass = createEClass( TSERVICE_TYPE_REALIZATION );
-        createEAttribute( tServiceTypeRealizationEClass, TSERVICE_TYPE_REALIZATION__FC );
-        createEAttribute( tServiceTypeRealizationEClass, TSERVICE_TYPE_REALIZATION__NAME );
-        createEAttribute( tServiceTypeRealizationEClass, TSERVICE_TYPE_REALIZATION__PRES_COND );
-        createEAttribute( tServiceTypeRealizationEClass, TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS );
-        createEAttribute( tServiceTypeRealizationEClass, TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID );
-        createEAttribute( tServiceTypeRealizationEClass, TSERVICE_TYPE_REALIZATION__TYPE );
-        createEAttribute( tServiceTypeRealizationEClass, TSERVICE_TYPE_REALIZATION__TYPE_KIND );
-
-        tServiceTypeRealizationsEClass = createEClass( TSERVICE_TYPE_REALIZATIONS );
-        createEReference( tServiceTypeRealizationsEClass, TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION );
-
-        tSubDataAttributeEClass = createEClass( TSUB_DATA_ATTRIBUTE );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__IS_ARRAY );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__MAX_VALUE );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__MIN_INDEX );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__MIN_VALUE );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__NAME );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__PRES_COND );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__TYPE );
-        createEAttribute( tSubDataAttributeEClass, TSUB_DATA_ATTRIBUTE__TYPE_KIND );
-
-        tSubDataObjectEClass = createEClass( TSUB_DATA_OBJECT );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__IS_ARRAY );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__MIN_INDEX );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__NAME );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__PRES_COND );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__PRES_COND_ARGS );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__PRES_COND_ARGS_ID );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__SIZE_ATTRIBUTE );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__TYPE );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__UNDERLYING_TYPE );
-        createEAttribute( tSubDataObjectEClass, TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND );
-
-        tTitledClassEClass = createEClass( TTITLED_CLASS );
-        createEAttribute( tTitledClassEClass, TTITLED_CLASS__TITLE_ID );
+        abbreviationEClass = createEClass( ABBREVIATION );
+        createEAttribute( abbreviationEClass, ABBREVIATION__DESC_ID );
+        createEAttribute( abbreviationEClass, ABBREVIATION__NAME );
+
+        abbreviationsEClass = createEClass( ABBREVIATIONS );
+        createEReference( abbreviationsEClass, ABBREVIATIONS__ABBREVIATION );
+
+        abstractLNClassEClass = createEClass( ABSTRACT_LN_CLASS );
+        createEAttribute( abstractLNClassEClass, ABSTRACT_LN_CLASS__NAME );
+
+        anyLNClassEClass = createEClass( ANY_LN_CLASS );
+        createEReference( anyLNClassEClass, ANY_LN_CLASS__DATA_OBJECT );
+        createEAttribute( anyLNClassEClass, ANY_LN_CLASS__BASE );
+
+        applicableServiceNSEClass = createEClass( APPLICABLE_SERVICE_NS );
+        createEReference( applicableServiceNSEClass, APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE );
+        createEAttribute( applicableServiceNSEClass, APPLICABLE_SERVICE_NS__DATE );
+        createEAttribute( applicableServiceNSEClass, APPLICABLE_SERVICE_NS__VERSION );
+
+        applicableServicesEClass = createEClass( APPLICABLE_SERVICES );
+        createEReference( applicableServicesEClass, APPLICABLE_SERVICES__SERVICE );
+        createEReference( applicableServicesEClass, APPLICABLE_SERVICES__DATA_SET_MEMBER_OF );
+
+        basicTypeEClass = createEClass( BASIC_TYPE );
+        createEAttribute( basicTypeEClass, BASIC_TYPE__DESC_ID );
+        createEAttribute( basicTypeEClass, BASIC_TYPE__NAME );
+
+        basicTypesEClass = createEClass( BASIC_TYPES );
+        createEReference( basicTypesEClass, BASIC_TYPES__BASIC_TYPE );
+
+        cdcEClass = createEClass( CDC );
+        createEReference( cdcEClass, CDC__SUB_DATA_OBJECT );
+        createEReference( cdcEClass, CDC__DATA_ATTRIBUTE );
+        createEReference( cdcEClass, CDC__SERVICE_PARAMETER );
+        createEAttribute( cdcEClass, CDC__ENUM_PARAMETERIZED );
+        createEAttribute( cdcEClass, CDC__NAME );
+        createEAttribute( cdcEClass, CDC__STATISTICS );
+        createEAttribute( cdcEClass, CDC__TYPE_KIND_PARAMETERIZED );
+        createEAttribute( cdcEClass, CDC__VARIANT );
+
+        cdCsEClass = createEClass( CD_CS );
+        createEReference( cdCsEClass, CD_CS__CDC );
+
+        changesEClass = createEClass( CHANGES );
+        createEAttribute( changesEClass, CHANGES__CHANGES_ID );
+        createEAttribute( changesEClass, CHANGES__DATE );
+        createEAttribute( changesEClass, CHANGES__REVISION );
+        createEAttribute( changesEClass, CHANGES__TISSUES );
+
+        constructedAttributeEClass = createEClass( CONSTRUCTED_ATTRIBUTE );
+        createEReference( constructedAttributeEClass, CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE );
+        createEAttribute( constructedAttributeEClass, CONSTRUCTED_ATTRIBUTE__NAME );
+
+        constructedAttributesEClass = createEClass( CONSTRUCTED_ATTRIBUTES );
+        createEReference( constructedAttributesEClass, CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE );
+
+        copyrightedEClass = createEClass( COPYRIGHTED );
+        createEReference( copyrightedEClass, COPYRIGHTED__COPYRIGHT );
+
+        copyrightNoticeEClass = createEClass( COPYRIGHT_NOTICE );
+        createEReference( copyrightNoticeEClass, COPYRIGHT_NOTICE__NOTICE );
+        createEReference( copyrightNoticeEClass, COPYRIGHT_NOTICE__LICENSE );
+
+        dataAttributeEClass = createEClass( DATA_ATTRIBUTE );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__DCHG );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__DEFAULT_VALUE );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__DUPD );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__FC );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__IS_ARRAY );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__MAX_VALUE );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__MIN_INDEX );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__MIN_VALUE );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__NAME );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__PRES_COND );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__PRES_COND_ARGS );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__PRES_COND_ARGS_ID );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__QCHG );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__SIZE_ATTRIBUTE );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__TYPE );
+        createEAttribute( dataAttributeEClass, DATA_ATTRIBUTE__TYPE_KIND );
+
+        dataObjectEClass = createEClass( DATA_OBJECT );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__DS_PRES_COND );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__DS_PRES_COND_ARGS );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__DS_PRES_COND_ARGS_ID );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__NAME );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__PRES_COND );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__PRES_COND_ARGS );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__PRES_COND_ARGS_ID );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__TRANSIENT );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__TYPE );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__UNDERLYING_TYPE );
+        createEAttribute( dataObjectEClass, DATA_OBJECT__UNDERLYING_TYPE_KIND );
+
+        dataSetMemberOfEClass = createEClass( DATA_SET_MEMBER_OF );
+        createEAttribute( dataSetMemberOfEClass, DATA_SET_MEMBER_OF__CB );
+
+        docEClass = createEClass( DOC );
+        createEAttribute( docEClass, DOC__MIXED );
+        createEAttribute( docEClass, DOC__GROUP );
+        createEAttribute( docEClass, DOC__ANY );
+        createEAttribute( docEClass, DOC__ID );
+
+        documentedClassEClass = createEClass( DOCUMENTED_CLASS );
+        createEAttribute( documentedClassEClass, DOCUMENTED_CLASS__DEPRECATED );
+        createEAttribute( documentedClassEClass, DOCUMENTED_CLASS__DESC_ID );
+        createEAttribute( documentedClassEClass, DOCUMENTED_CLASS__INFORMATIVE );
+
+        enumerationEClass = createEClass( ENUMERATION );
+        createEReference( enumerationEClass, ENUMERATION__LITERAL );
+        createEAttribute( enumerationEClass, ENUMERATION__INHERITED_FROM );
+        createEAttribute( enumerationEClass, ENUMERATION__NAME );
+
+        enumerationsEClass = createEClass( ENUMERATIONS );
+        createEReference( enumerationsEClass, ENUMERATIONS__ENUMERATION );
+
+        functionalConstraintEClass = createEClass( FUNCTIONAL_CONSTRAINT );
+        createEReference( functionalConstraintEClass, FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES );
+        createEAttribute( functionalConstraintEClass, FUNCTIONAL_CONSTRAINT__ABBREVIATION );
+        createEAttribute( functionalConstraintEClass, FUNCTIONAL_CONSTRAINT__DESC_ID );
+        createEAttribute( functionalConstraintEClass, FUNCTIONAL_CONSTRAINT__TITLE_ID );
+
+        functionalConstraintsEClass = createEClass( FUNCTIONAL_CONSTRAINTS );
+        createEReference( functionalConstraintsEClass, FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT );
+
+        licenseEClass = createEClass( LICENSE );
+        createEAttribute( licenseEClass, LICENSE__MIXED );
+        createEAttribute( licenseEClass, LICENSE__KIND );
+        createEAttribute( licenseEClass, LICENSE__URI );
+
+        literalEClass = createEClass( LITERAL );
+        createEAttribute( literalEClass, LITERAL__LITERAL_VAL );
+        createEAttribute( literalEClass, LITERAL__NAME );
+
+        lnClassEClass = createEClass( LN_CLASS );
+        createEAttribute( lnClassEClass, LN_CLASS__CAN_HAVE_LOG );
+        createEAttribute( lnClassEClass, LN_CLASS__IS_EXTENSION );
+        createEAttribute( lnClassEClass, LN_CLASS__NAME );
+
+        lnClassesEClass = createEClass( LN_CLASSES );
+        createEReference( lnClassesEClass, LN_CLASSES__ABSTRACT_LN_CLASS );
+        createEReference( lnClassesEClass, LN_CLASSES__LN_CLASS );
+
+        noticeEClass = createEClass( NOTICE );
+        createEAttribute( noticeEClass, NOTICE__MIXED );
+
+        nsEClass = createEClass( NS );
+        createEReference( nsEClass, NS__CHANGES );
+        createEReference( nsEClass, NS__DEPENDS_ON );
+        createEReference( nsEClass, NS__BASIC_TYPES );
+        createEReference( nsEClass, NS__FUNCTIONAL_CONSTRAINTS );
+        createEReference( nsEClass, NS__PRESENCE_CONDITIONS );
+        createEReference( nsEClass, NS__ABBREVIATIONS );
+        createEReference( nsEClass, NS__ENUMERATIONS );
+        createEReference( nsEClass, NS__CONSTRUCTED_ATTRIBUTES );
+        createEReference( nsEClass, NS__CD_CS );
+        createEReference( nsEClass, NS__LN_CLASSES );
+        createEAttribute( nsEClass, NS__DESC_ID );
+        createEAttribute( nsEClass, NS__ID );
+        createEAttribute( nsEClass, NS__PUBLICATION_STAGE );
+        createEAttribute( nsEClass, NS__REVISION );
+        createEAttribute( nsEClass, NS__UML_DATE );
+        createEAttribute( nsEClass, NS__UML_VERSION );
+
+        nsDocEClass = createEClass( NS_DOC );
+        createEReference( nsDocEClass, NS_DOC__DOC );
+        createEAttribute( nsDocEClass, NS_DOC__ID );
+        createEAttribute( nsDocEClass, NS_DOC__LANG );
+        createEAttribute( nsDocEClass, NS_DOC__PUBLICATION_STAGE );
+        createEAttribute( nsDocEClass, NS_DOC__REVISION );
+        createEAttribute( nsDocEClass, NS_DOC__UML_DATE );
+        createEAttribute( nsDocEClass, NS_DOC__UML_VERSION );
+
+        presenceConditionEClass = createEClass( PRESENCE_CONDITION );
+        createEAttribute( presenceConditionEClass, PRESENCE_CONDITION__ARGUMENT );
+        createEAttribute( presenceConditionEClass, PRESENCE_CONDITION__DESC_ID );
+        createEAttribute( presenceConditionEClass, PRESENCE_CONDITION__NAME );
+        createEAttribute( presenceConditionEClass, PRESENCE_CONDITION__TITLE_ID );
+
+        presenceConditionsEClass = createEClass( PRESENCE_CONDITIONS );
+        createEReference( presenceConditionsEClass, PRESENCE_CONDITIONS__PRESENCE_CONDITION );
+
+        serviceCDCEClass = createEClass( SERVICE_CDC );
+        createEReference( serviceCDCEClass, SERVICE_CDC__SERVICE_DATA_ATTRIBUTE );
+        createEAttribute( serviceCDCEClass, SERVICE_CDC__CDC );
+        createEAttribute( serviceCDCEClass, SERVICE_CDC__VARIANT );
+
+        serviceCDCsEClass = createEClass( SERVICE_CD_CS );
+        createEReference( serviceCDCsEClass, SERVICE_CD_CS__SERVICE_CDC );
+
+        serviceConstructedAttributeEClass = createEClass( SERVICE_CONSTRUCTED_ATTRIBUTE );
+        createEAttribute( serviceConstructedAttributeEClass, SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED );
+
+        serviceConstructedAttributesEClass = createEClass( SERVICE_CONSTRUCTED_ATTRIBUTES );
+        createEReference( serviceConstructedAttributesEClass,
+                SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE );
+
+        serviceDataAttributeEClass = createEClass( SERVICE_DATA_ATTRIBUTE );
+        createEAttribute( serviceDataAttributeEClass, SERVICE_DATA_ATTRIBUTE__FC );
+        createEAttribute( serviceDataAttributeEClass, SERVICE_DATA_ATTRIBUTE__NAME );
+        createEAttribute( serviceDataAttributeEClass, SERVICE_DATA_ATTRIBUTE__PRES_COND );
+        createEAttribute( serviceDataAttributeEClass, SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS );
+        createEAttribute( serviceDataAttributeEClass, SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID );
+        createEAttribute( serviceDataAttributeEClass, SERVICE_DATA_ATTRIBUTE__TYPE );
+        createEAttribute( serviceDataAttributeEClass, SERVICE_DATA_ATTRIBUTE__TYPE_KIND );
+        createEAttribute( serviceDataAttributeEClass, SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE );
+        createEAttribute( serviceDataAttributeEClass, SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND );
+
+        serviceNSEClass = createEClass( SERVICE_NS );
+        createEReference( serviceNSEClass, SERVICE_NS__CHANGES );
+        createEReference( serviceNSEClass, SERVICE_NS__FUNCTIONAL_CONSTRAINTS );
+        createEReference( serviceNSEClass, SERVICE_NS__PRESENCE_CONDITIONS );
+        createEReference( serviceNSEClass, SERVICE_NS__ABBREVIATIONS );
+        createEReference( serviceNSEClass, SERVICE_NS__SERVICE_TYPE_REALIZATIONS );
+        createEReference( serviceNSEClass, SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES );
+        createEReference( serviceNSEClass, SERVICE_NS__SERVICE_CD_CS );
+        createEAttribute( serviceNSEClass, SERVICE_NS__DESC_ID );
+        createEAttribute( serviceNSEClass, SERVICE_NS__ID );
+        createEAttribute( serviceNSEClass, SERVICE_NS__PUBLICATION_STAGE );
+        createEAttribute( serviceNSEClass, SERVICE_NS__REVISION );
+        createEAttribute( serviceNSEClass, SERVICE_NS__UML_DATE );
+        createEAttribute( serviceNSEClass, SERVICE_NS__UML_VERSION );
+
+        serviceNsUsageEClass = createEClass( SERVICE_NS_USAGE );
+        createEReference( serviceNsUsageEClass, SERVICE_NS_USAGE__APPLIES_TO );
+        createEAttribute( serviceNsUsageEClass, SERVICE_NS_USAGE__ID );
+        createEAttribute( serviceNsUsageEClass, SERVICE_NS_USAGE__PUBLICATION_STAGE );
+        createEAttribute( serviceNsUsageEClass, SERVICE_NS_USAGE__REVISION );
+
+        serviceParameterEClass = createEClass( SERVICE_PARAMETER );
+        createEAttribute( serviceParameterEClass, SERVICE_PARAMETER__DEFAULT_VALUE );
+        createEAttribute( serviceParameterEClass, SERVICE_PARAMETER__MAX_VALUE );
+        createEAttribute( serviceParameterEClass, SERVICE_PARAMETER__MIN_VALUE );
+        createEAttribute( serviceParameterEClass, SERVICE_PARAMETER__NAME );
+        createEAttribute( serviceParameterEClass, SERVICE_PARAMETER__TYPE );
+        createEAttribute( serviceParameterEClass, SERVICE_PARAMETER__TYPE_KIND );
+
+        serviceTypeRealizationEClass = createEClass( SERVICE_TYPE_REALIZATION );
+        createEAttribute( serviceTypeRealizationEClass, SERVICE_TYPE_REALIZATION__FC );
+        createEAttribute( serviceTypeRealizationEClass, SERVICE_TYPE_REALIZATION__NAME );
+        createEAttribute( serviceTypeRealizationEClass, SERVICE_TYPE_REALIZATION__PRES_COND );
+        createEAttribute( serviceTypeRealizationEClass, SERVICE_TYPE_REALIZATION__PRES_COND_ARGS );
+        createEAttribute( serviceTypeRealizationEClass, SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID );
+        createEAttribute( serviceTypeRealizationEClass, SERVICE_TYPE_REALIZATION__TYPE );
+        createEAttribute( serviceTypeRealizationEClass, SERVICE_TYPE_REALIZATION__TYPE_KIND );
+
+        serviceTypeRealizationsEClass = createEClass( SERVICE_TYPE_REALIZATIONS );
+        createEReference( serviceTypeRealizationsEClass, SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION );
+
+        subDataAttributeEClass = createEClass( SUB_DATA_ATTRIBUTE );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__DEFAULT_VALUE );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__IS_ARRAY );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__MAX_VALUE );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__MIN_INDEX );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__MIN_VALUE );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__NAME );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__PRES_COND );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__PRES_COND_ARGS );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__TYPE );
+        createEAttribute( subDataAttributeEClass, SUB_DATA_ATTRIBUTE__TYPE_KIND );
+
+        subDataObjectEClass = createEClass( SUB_DATA_OBJECT );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__IS_ARRAY );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__MIN_INDEX );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__NAME );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__PRES_COND );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__PRES_COND_ARGS );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__PRES_COND_ARGS_ID );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__SIZE_ATTRIBUTE );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__TYPE );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__UNDERLYING_TYPE );
+        createEAttribute( subDataObjectEClass, SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND );
+
+        titledClassEClass = createEClass( TITLED_CLASS );
+        createEAttribute( titledClassEClass, TITLED_CLASS__TITLE_ID );
+
+        nsdObjectWithVersionAndReleaseEClass = createEClass( NSD_OBJECT_WITH_VERSION_AND_RELEASE );
+        createEAttribute( nsdObjectWithVersionAndReleaseEClass, NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE );
+        createEAttribute( nsdObjectWithVersionAndReleaseEClass, NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION );
 
         // Create enums
-        tacsiServicesKindEEnum = createEEnum( TACSI_SERVICES_KIND );
-        tcbKindEEnum = createEEnum( TCB_KIND );
-        tDefinedAttributeTypeKindEEnum = createEEnum( TDEFINED_ATTRIBUTE_TYPE_KIND );
-        tLicenseKindEEnum = createEEnum( TLICENSE_KIND );
-        tPubStageEEnum = createEEnum( TPUB_STAGE );
-        tUndefinedAttributeTypeKindEEnum = createEEnum( TUNDEFINED_ATTRIBUTE_TYPE_KIND );
+        acsiServicesKindEEnum = createEEnum( ACSI_SERVICES_KIND );
+        cbKindEEnum = createEEnum( CB_KIND );
+        definedAttributeTypeKindEEnum = createEEnum( DEFINED_ATTRIBUTE_TYPE_KIND );
+        licenseKindEEnum = createEEnum( LICENSE_KIND );
+        pubStageEEnum = createEEnum( PUB_STAGE );
+        undefinedAttributeTypeKindEEnum = createEEnum( UNDEFINED_ATTRIBUTE_TYPE_KIND );
 
         // Create data types
-        tAbbreviationNameEDataType = createEDataType( TABBREVIATION_NAME );
-        tAbstractLNClassNameEDataType = createEDataType( TABSTRACT_LN_CLASS_NAME );
-        tacsiServicesKindObjectEDataType = createEDataType( TACSI_SERVICES_KIND_OBJECT );
-        tAttributeNameEDataType = createEDataType( TATTRIBUTE_NAME );
-        tAttributeTypeKindEDataType = createEDataType( TATTRIBUTE_TYPE_KIND );
-        tBasicTypeNameEDataType = createEDataType( TBASIC_TYPE_NAME );
-        tcbKindObjectEDataType = createEDataType( TCB_KIND_OBJECT );
-        tcdcNameEDataType = createEDataType( TCDC_NAME );
-        tDataObjectNameEDataType = createEDataType( TDATA_OBJECT_NAME );
-        tDefinedAttributeTypeKindObjectEDataType = createEDataType( TDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT );
-        tDocIDEDataType = createEDataType( TDOC_ID );
-        tEmptyStringEDataType = createEDataType( TEMPTY_STRING );
-        tfcAbbreviationEDataType = createEDataType( TFC_ABBREVIATION );
-        tIec61850NameEDataType = createEDataType( TIEC61850_NAME );
-        tIec61850NameStringEDataType = createEDataType( TIEC61850_NAME_STRING );
-        tissuesTypeEDataType = createEDataType( TISSUES_TYPE );
-        tLicenseKindObjectEDataType = createEDataType( TLICENSE_KIND_OBJECT );
-        tLiteralNameEDataType = createEDataType( TLITERAL_NAME );
-        tlnClassNameEDataType = createEDataType( TLN_CLASS_NAME );
-        tnsIdentifierEDataType = createEDataType( TNS_IDENTIFIER );
-        tnsReleaseEDataType = createEDataType( TNS_RELEASE );
-        tnsReleaseObjectEDataType = createEDataType( TNS_RELEASE_OBJECT );
-        tnsRevisionEDataType = createEDataType( TNS_REVISION );
-        tnsVersionEDataType = createEDataType( TNS_VERSION );
-        tnsVersionObjectEDataType = createEDataType( TNS_VERSION_OBJECT );
-        tPresenceConditionArgumentEDataType = createEDataType( TPRESENCE_CONDITION_ARGUMENT );
-        tPresenceConditionNameEDataType = createEDataType( TPRESENCE_CONDITION_NAME );
-        tPubStageObjectEDataType = createEDataType( TPUB_STAGE_OBJECT );
-        tSubDataObjectNameEDataType = createEDataType( TSUB_DATA_OBJECT_NAME );
-        tumlVersionEDataType = createEDataType( TUML_VERSION );
-        tUndefinedAttributeTypeKindObjectEDataType = createEDataType( TUNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT );
+        acsiServicesKindObjectEDataType = createEDataType( ACSI_SERVICES_KIND_OBJECT );
+        attributeTypeKindEDataType = createEDataType( ATTRIBUTE_TYPE_KIND );
+        cbKindObjectEDataType = createEDataType( CB_KIND_OBJECT );
+        definedAttributeTypeKindObjectEDataType = createEDataType( DEFINED_ATTRIBUTE_TYPE_KIND_OBJECT );
+        licenseKindObjectEDataType = createEDataType( LICENSE_KIND_OBJECT );
+        pubStageObjectEDataType = createEDataType( PUB_STAGE_OBJECT );
+        undefinedAttributeTypeKindObjectEDataType = createEDataType( UNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT );
     }
 
     /**
@@ -4243,56 +3699,57 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
         // Set bounds for type parameters
 
         // Add supertypes to classes
-        tAbstractLNClassEClass.getESuperTypes().add( this.getTAnyLNClass() );
-        tAnyLNClassEClass.getESuperTypes().add( this.getTTitledClass() );
-        tApplicableServiceNSEClass.getESuperTypes().add( this.getTCopyrighted() );
-        tcdcEClass.getESuperTypes().add( this.getTTitledClass() );
-        tConstructedAttributeEClass.getESuperTypes().add( this.getTTitledClass() );
-        tDataAttributeEClass.getESuperTypes().add( this.getTDocumentedClass() );
-        tDataObjectEClass.getESuperTypes().add( this.getTDocumentedClass() );
-        tEnumerationEClass.getESuperTypes().add( this.getTTitledClass() );
-        tLiteralEClass.getESuperTypes().add( this.getTDocumentedClass() );
-        tlnClassEClass.getESuperTypes().add( this.getTAnyLNClass() );
-        tnsEClass.getESuperTypes().add( this.getTCopyrighted() );
-        tnsDocEClass.getESuperTypes().add( this.getTCopyrighted() );
-        tServiceConstructedAttributeEClass.getESuperTypes().add( this.getTConstructedAttribute() );
-        tServiceDataAttributeEClass.getESuperTypes().add( this.getTDocumentedClass() );
-        tServiceNSEClass.getESuperTypes().add( this.getTCopyrighted() );
-        tServiceParameterEClass.getESuperTypes().add( this.getTDocumentedClass() );
-        tSubDataAttributeEClass.getESuperTypes().add( this.getTDocumentedClass() );
-        tSubDataObjectEClass.getESuperTypes().add( this.getTDocumentedClass() );
-        tTitledClassEClass.getESuperTypes().add( this.getTDocumentedClass() );
+        appliesToTypeEClass.getESuperTypes().add( this.getNSDObjectWithVersionAndRelease() );
+        dependsOnTypeEClass.getESuperTypes().add( this.getNSDObjectWithVersionAndRelease() );
+        abstractLNClassEClass.getESuperTypes().add( this.getAnyLNClass() );
+        anyLNClassEClass.getESuperTypes().add( this.getTitledClass() );
+        applicableServiceNSEClass.getESuperTypes().add( this.getCopyrighted() );
+        cdcEClass.getESuperTypes().add( this.getTitledClass() );
+        changesEClass.getESuperTypes().add( this.getNSDObjectWithVersionAndRelease() );
+        constructedAttributeEClass.getESuperTypes().add( this.getTitledClass() );
+        dataAttributeEClass.getESuperTypes().add( this.getDocumentedClass() );
+        dataObjectEClass.getESuperTypes().add( this.getDocumentedClass() );
+        enumerationEClass.getESuperTypes().add( this.getTitledClass() );
+        literalEClass.getESuperTypes().add( this.getDocumentedClass() );
+        lnClassEClass.getESuperTypes().add( this.getAnyLNClass() );
+        nsEClass.getESuperTypes().add( this.getCopyrighted() );
+        nsEClass.getESuperTypes().add( this.getNSDObjectWithVersionAndRelease() );
+        nsDocEClass.getESuperTypes().add( this.getCopyrighted() );
+        nsDocEClass.getESuperTypes().add( this.getNSDObjectWithVersionAndRelease() );
+        serviceConstructedAttributeEClass.getESuperTypes().add( this.getConstructedAttribute() );
+        serviceDataAttributeEClass.getESuperTypes().add( this.getDocumentedClass() );
+        serviceNSEClass.getESuperTypes().add( this.getCopyrighted() );
+        serviceNSEClass.getESuperTypes().add( this.getNSDObjectWithVersionAndRelease() );
+        serviceNsUsageEClass.getESuperTypes().add( this.getNSDObjectWithVersionAndRelease() );
+        serviceParameterEClass.getESuperTypes().add( this.getDocumentedClass() );
+        subDataAttributeEClass.getESuperTypes().add( this.getDocumentedClass() );
+        subDataObjectEClass.getESuperTypes().add( this.getDocumentedClass() );
+        titledClassEClass.getESuperTypes().add( this.getDocumentedClass() );
 
         // Initialize classes, features, and operations; add parameters
         initEClass( appliesToTypeEClass, AppliesToType.class, "AppliesToType", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getAppliesToType_Id(), this.getTNSIdentifier(), "id", null, 1, 1, AppliesToType.class,
+        initEAttribute( getAppliesToType_Id(), ecorePackage.getEString(), "id", null, 1, 1, AppliesToType.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getAppliesToType_PublicationStage(), this.getTPubStage(), "publicationStage", "IS", 0, 1,
+        initEAttribute( getAppliesToType_PublicationStage(), this.getPubStage(), "publicationStage", "IS", 0, 1,
+                AppliesToType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getAppliesToType_Revision(), ecorePackage.getEString(), "revision", "A", 0, 1,
                 AppliesToType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getAppliesToType_Release(), this.getTNSRelease(), "release", "1", 0, 1, AppliesToType.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getAppliesToType_Revision(), this.getTNSRevision(), "revision", "A", 0, 1, AppliesToType.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getAppliesToType_Version(), this.getTNSVersion(), "version", null, 1, 1, AppliesToType.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
         initEClass( dependsOnTypeEClass, DependsOnType.class, "DependsOnType", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getDependsOnType_Id(), this.getTNSIdentifier(), "id", null, 1, 1, DependsOnType.class,
+        initEAttribute( getDependsOnType_Id(), ecorePackage.getEString(), "id", null, 1, 1, DependsOnType.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getDependsOnType_PublicationStage(), this.getTPubStage(), "publicationStage", "IS", 0, 1,
+        initEAttribute( getDependsOnType_PublicationStage(), this.getPubStage(), "publicationStage", "IS", 0, 1,
+                DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getDependsOnType_Revision(), ecorePackage.getEString(), "revision", "A", 0, 1,
                 DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getDependsOnType_Release(), this.getTNSRelease(), "release", "1", 0, 1, DependsOnType.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getDependsOnType_Revision(), this.getTNSRevision(), "revision", "A", 0, 1, DependsOnType.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getDependsOnType_Version(), this.getTNSVersion(), "version", null, 1, 1, DependsOnType.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
         initEClass( documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
@@ -4305,881 +3762,821 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
         initEReference( getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null,
                 "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
                 !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getDocumentRoot_ApplicableServiceNS(), this.getTApplicableServiceNS(), null,
+        initEReference( getDocumentRoot_ApplicableServiceNS(), this.getApplicableServiceNS(), null,
                 "applicableServiceNS", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
                 !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED );
-        initEReference( getDocumentRoot_Copyright(), this.getTCopyrightNotice(), null, "copyright", null, 0, -2, null,
+        initEReference( getDocumentRoot_Copyright(), this.getCopyrightNotice(), null, "copyright", null, 0, -2, null,
                 IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
                 IS_DERIVED, IS_ORDERED );
-        initEReference( getDocumentRoot_NS(), this.getTNS(), null, "nS", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE,
+        initEReference( getDocumentRoot_NS(), this.getNS(), null, "nS", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE,
                 IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED );
-        initEReference( getDocumentRoot_NSDoc(), this.getTNSDoc(), null, "nSDoc", null, 0, -2, null, IS_TRANSIENT,
+        initEReference( getDocumentRoot_NSDoc(), this.getNSDoc(), null, "nSDoc", null, 0, -2, null, IS_TRANSIENT,
                 IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
                 IS_ORDERED );
-        initEReference( getDocumentRoot_ServiceNS(), this.getTServiceNS(), null, "serviceNS", null, 0, -2, null,
+        initEReference( getDocumentRoot_ServiceNS(), this.getServiceNS(), null, "serviceNS", null, 0, -2, null,
                 IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
                 IS_DERIVED, IS_ORDERED );
 
         initEClass( serviceTypeEClass, ServiceType.class, "ServiceType", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getServiceType_Name(), this.getTACSIServicesKind(), "name", null, 1, 1, ServiceType.class,
+        initEAttribute( getServiceType_Name(), this.getACSIServicesKind(), "name", null, 1, 1, ServiceType.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tAbbreviationEClass, TAbbreviation.class, "TAbbreviation", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( abbreviationEClass, Abbreviation.class, "Abbreviation", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTAbbreviation_DescID(), this.getTDocID(), "descID", null, 0, 1, TAbbreviation.class,
+        initEAttribute( getAbbreviation_DescID(), ecorePackage.getEString(), "descID", null, 0, 1, Abbreviation.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTAbbreviation_Name(), this.getTAbbreviationName(), "name", null, 1, 1, TAbbreviation.class,
+        initEAttribute( getAbbreviation_Name(), ecorePackage.getEString(), "name", null, 1, 1, Abbreviation.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
 
-        initEClass( tAbbreviationsEClass, TAbbreviations.class, "TAbbreviations", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( abbreviationsEClass, Abbreviations.class, "Abbreviations", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTAbbreviations_Abbreviation(), this.getTAbbreviation(), null, "abbreviation", null, 1, -1,
-                TAbbreviations.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getAbbreviations_Abbreviation(), this.getAbbreviation(), null, "abbreviation", null, 1, -1,
+                Abbreviations.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tAbstractLNClassEClass, TAbstractLNClass.class, "TAbstractLNClass", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( abstractLNClassEClass, AbstractLNClass.class, "AbstractLNClass", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTAbstractLNClass_Name(), this.getTAbstractLNClassName(), "name", null, 1, 1,
-                TAbstractLNClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getAbstractLNClass_Name(), ecorePackage.getEString(), "name", null, 1, 1, AbstractLNClass.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED );
 
-        initEClass( tAnyLNClassEClass, TAnyLNClass.class, "TAnyLNClass", IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( anyLNClassEClass, AnyLNClass.class, "AnyLNClass", IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTAnyLNClass_DataObject(), this.getTDataObject(), null, "dataObject", null, 0, -1,
-                TAnyLNClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getAnyLNClass_DataObject(), this.getDataObject(), null, "dataObject", null, 0, -1,
+                AnyLNClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTAnyLNClass_Base(), this.getTAbstractLNClassName(), "base", null, 0, 1, TAnyLNClass.class,
+        initEAttribute( getAnyLNClass_Base(), ecorePackage.getEString(), "base", null, 0, 1, AnyLNClass.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
 
-        initEClass( tApplicableServiceNSEClass, TApplicableServiceNS.class, "TApplicableServiceNS", !IS_ABSTRACT,
+        initEClass( applicableServiceNSEClass, ApplicableServiceNS.class, "ApplicableServiceNS", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTApplicableServiceNS_ServiceNsUsage(), this.getTServiceNsUsage(), null, "serviceNsUsage",
-                null, 1, -1, TApplicableServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        initEReference( getApplicableServiceNS_ServiceNsUsage(), this.getServiceNsUsage(), null, "serviceNsUsage", null,
+                1, -1, ApplicableServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
                 !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTApplicableServiceNS_Date(), theXMLTypePackage.getDateTime(), "date", null, 1, 1,
-                TApplicableServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTApplicableServiceNS_Version(), theXMLTypePackage.getUnsignedInt(), "version", null, 1, 1,
-                TApplicableServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getApplicableServiceNS_Date(), theXMLTypePackage.getDateTime(), "date", null, 1, 1,
+                ApplicableServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getApplicableServiceNS_Version(), theXMLTypePackage.getUnsignedInt(), "version", null, 1, 1,
+                ApplicableServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tApplicableServicesEClass, TApplicableServices.class, "TApplicableServices", !IS_ABSTRACT,
+        initEClass( applicableServicesEClass, ApplicableServices.class, "ApplicableServices", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTApplicableServices_Service(), this.getServiceType(), null, "service", null, 0, -1,
-                TApplicableServices.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTApplicableServices_DataSetMemberOf(), this.getTDataSetMemberOf(), null, "dataSetMemberOf",
-                null, 0, -1, TApplicableServices.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        initEReference( getApplicableServices_Service(), this.getServiceType(), null, "service", null, 0, -1,
+                ApplicableServices.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEReference( getApplicableServices_DataSetMemberOf(), this.getDataSetMemberOf(), null, "dataSetMemberOf",
+                null, 0, -1, ApplicableServices.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
                 !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tBasicTypeEClass, TBasicType.class, "TBasicType", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( basicTypeEClass, BasicType.class, "BasicType", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTBasicType_DescID(), this.getTDocID(), "descID", null, 0, 1, TBasicType.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTBasicType_Name(), this.getTBasicTypeName(), "name", null, 1, 1, TBasicType.class,
+        initEAttribute( getBasicType_DescID(), ecorePackage.getEString(), "descID", null, 0, 1, BasicType.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED );
+        initEAttribute( getBasicType_Name(), ecorePackage.getEString(), "name", null, 1, 1, BasicType.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
 
-        initEClass( tBasicTypesEClass, TBasicTypes.class, "TBasicTypes", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( basicTypesEClass, BasicTypes.class, "BasicTypes", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTBasicTypes_BasicType(), this.getTBasicType(), null, "basicType", null, 1, -1,
-                TBasicTypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getBasicTypes_BasicType(), this.getBasicType(), null, "basicType", null, 1, -1,
+                BasicTypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tcdcEClass, fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC.class, "TCDC", !IS_ABSTRACT,
+        initEClass( cdcEClass, fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC.class, "CDC", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTCDC_SubDataObject(), this.getTSubDataObject(), null, "subDataObject", null, 0, -1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getCDC_SubDataObject(), this.getSubDataObject(), null, "subDataObject", null, 0, -1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTCDC_DataAttribute(), this.getTDataAttribute(), null, "dataAttribute", null, 1, -1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getCDC_DataAttribute(), this.getDataAttribute(), null, "dataAttribute", null, 1, -1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTCDC_ServiceParameter(), this.getTServiceParameter(), null, "serviceParameter", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getCDC_ServiceParameter(), this.getServiceParameter(), null, "serviceParameter", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTCDC_EnumParameterized(), theXMLTypePackage.getBoolean(), "enumParameterized", "false", 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getCDC_EnumParameterized(), theXMLTypePackage.getBoolean(), "enumParameterized", "false", 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTCDC_Name(), this.getTCDCName(), "name", null, 1, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getCDC_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTCDC_Statistics(), theXMLTypePackage.getBoolean(), "statistics", "false", 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getCDC_Statistics(), theXMLTypePackage.getBoolean(), "statistics", "false", 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTCDC_TypeKindParameterized(), theXMLTypePackage.getBoolean(), "typeKindParameterized",
-                "false", 0, 1, fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEAttribute( getCDC_TypeKindParameterized(), theXMLTypePackage.getBoolean(), "typeKindParameterized",
+                "false", 0, 1, fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTCDC_Variant(), theXMLTypePackage.getToken(), "variant", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getCDC_Variant(), theXMLTypePackage.getToken(), "variant", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tcdCsEClass, TCDCs.class, "TCDCs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTCDCs_CDC(), this.getTCDC(), null, "cDC", null, 0, -1, TCDCs.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED );
+        initEClass( cdCsEClass, CDCs.class, "CDCs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEReference( getCDCs_CDC(), this.getCDC(), null, "cDC", null, 0, -1, CDCs.class, !IS_TRANSIENT, !IS_VOLATILE,
+                IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tChangesEClass, TChanges.class, "TChanges", !IS_ABSTRACT, !IS_INTERFACE,
-                IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTChanges_ChangesID(), this.getTDocID(), "changesID", null, 0, 1, TChanges.class,
+        initEClass( changesEClass, Changes.class, "Changes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getChanges_ChangesID(), ecorePackage.getEString(), "changesID", null, 0, 1, Changes.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTChanges_Date(), theXMLTypePackage.getDate(), "date", null, 0, 1, TChanges.class,
+        initEAttribute( getChanges_Date(), theXMLTypePackage.getDate(), "date", null, 0, 1, Changes.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTChanges_Release(), this.getTNSRelease(), "release", "1", 0, 1, TChanges.class,
+        initEAttribute( getChanges_Revision(), ecorePackage.getEString(), "revision", "A", 0, 1, Changes.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTChanges_Revision(), this.getTNSRevision(), "revision", "A", 0, 1, TChanges.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTChanges_Tissues(), this.getTissuesType(), "tissues", null, 0, 1, TChanges.class,
+        initEAttribute( getChanges_Tissues(), ecorePackage.getEString(), "tissues", null, 0, 1, Changes.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTChanges_Version(), this.getTNSVersion(), "version", null, 1, 1, TChanges.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tConstructedAttributeEClass, TConstructedAttribute.class, "TConstructedAttribute", !IS_ABSTRACT,
+        initEClass( constructedAttributeEClass, ConstructedAttribute.class, "ConstructedAttribute", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTConstructedAttribute_SubDataAttribute(), this.getTSubDataAttribute(), null,
-                "subDataAttribute", null, 1, -1, TConstructedAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTConstructedAttribute_Name(), this.getTIec61850Name(), "name", null, 1, 1,
-                TConstructedAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEReference( getConstructedAttribute_SubDataAttribute(), this.getSubDataAttribute(), null,
+                "subDataAttribute", null, 1, -1, ConstructedAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getConstructedAttribute_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+                ConstructedAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tConstructedAttributesEClass, TConstructedAttributes.class, "TConstructedAttributes", !IS_ABSTRACT,
+        initEClass( constructedAttributesEClass, ConstructedAttributes.class, "ConstructedAttributes", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTConstructedAttributes_ConstructedAttribute(), this.getTConstructedAttribute(), null,
-                "constructedAttribute", null, 0, -1, TConstructedAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEReference( getConstructedAttributes_ConstructedAttribute(), this.getConstructedAttribute(), null,
+                "constructedAttribute", null, 0, -1, ConstructedAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tCopyrightedEClass, TCopyrighted.class, "TCopyrighted", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( copyrightedEClass, Copyrighted.class, "Copyrighted", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTCopyrighted_Copyright(), this.getTCopyrightNotice(), null, "copyright", null, 0, 1,
-                TCopyrighted.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getCopyrighted_Copyright(), this.getCopyrightNotice(), null, "copyright", null, 0, 1,
+                Copyrighted.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tCopyrightNoticeEClass, TCopyrightNotice.class, "TCopyrightNotice", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( copyrightNoticeEClass, CopyrightNotice.class, "CopyrightNotice", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTCopyrightNotice_Notice(), this.getTNotice(), null, "notice", null, 1, 1,
-                TCopyrightNotice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getCopyrightNotice_Notice(), this.getNotice(), null, "notice", null, 1, 1,
+                CopyrightNotice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTCopyrightNotice_License(), this.getTLicense(), null, "license", null, 1, 1,
-                TCopyrightNotice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getCopyrightNotice_License(), this.getLicense(), null, "license", null, 1, 1,
+                CopyrightNotice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tDataAttributeEClass, TDataAttribute.class, "TDataAttribute", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( dataAttributeEClass, DataAttribute.class, "DataAttribute", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTDataAttribute_Dchg(), theXMLTypePackage.getBoolean(), "dchg", "false", 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_Dchg(), theXMLTypePackage.getBoolean(), "dchg", "false", 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_DefaultValue(), theXMLTypePackage.getNormalizedString(), "defaultValue", null,
-                0, 1, TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getDataAttribute_DefaultValue(), theXMLTypePackage.getNormalizedString(), "defaultValue", null,
+                0, 1, DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_Dupd(), theXMLTypePackage.getBoolean(), "dupd", "false", 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_Dupd(), theXMLTypePackage.getBoolean(), "dupd", "false", 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_Fc(), this.getTFCAbbreviation(), "fc", null, 1, 1, TDataAttribute.class,
+        initEAttribute( getDataAttribute_Fc(), ecorePackage.getEString(), "fc", null, 1, 1, DataAttribute.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTDataAttribute_IsArray(), theXMLTypePackage.getBoolean(), "isArray", "false", 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_IsArray(), theXMLTypePackage.getBoolean(), "isArray", "false", 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_MaxIndexAttribute(), this.getTAttributeName(), "maxIndexAttribute", null, 0,
-                1, TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_MaxIndexAttribute(), ecorePackage.getEString(), "maxIndexAttribute", null, 0,
+                1, DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_MaxValue(), theXMLTypePackage.getDecimal(), "maxValue", null, 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_MaxValue(), theXMLTypePackage.getDecimal(), "maxValue", null, 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_MinIndex(), theXMLTypePackage.getUnsignedInt(), "minIndex", "0", 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_MinIndex(), theXMLTypePackage.getUnsignedInt(), "minIndex", "0", 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_MinValue(), theXMLTypePackage.getDecimal(), "minValue", null, 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_MinValue(), theXMLTypePackage.getDecimal(), "minValue", null, 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_Name(), this.getTAttributeName(), "name", null, 1, 1, TDataAttribute.class,
+        initEAttribute( getDataAttribute_Name(), ecorePackage.getEString(), "name", null, 1, 1, DataAttribute.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTDataAttribute_PresCond(), this.getTPresenceConditionName(), "presCond", "M", 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_PresCond(), ecorePackage.getEString(), "presCond", "M", 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_PresCondArgs(), this.getTPresenceConditionArgument(), "presCondArgs", null, 0,
-                1, TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_PresCondArgs(), ecorePackage.getEString(), "presCondArgs", null, 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_PresCondArgsID(), this.getTDocID(), "presCondArgsID", null, 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_PresCondArgsID(), ecorePackage.getEString(), "presCondArgsID", null, 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_Qchg(), theXMLTypePackage.getBoolean(), "qchg", "false", 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_Qchg(), theXMLTypePackage.getBoolean(), "qchg", "false", 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_SizeAttribute(), this.getTAttributeName(), "sizeAttribute", null, 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_SizeAttribute(), ecorePackage.getEString(), "sizeAttribute", null, 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataAttribute_Type(), this.getTIec61850Name(), "type", null, 0, 1, TDataAttribute.class,
+        initEAttribute( getDataAttribute_Type(), ecorePackage.getEString(), "type", null, 0, 1, DataAttribute.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTDataAttribute_TypeKind(), this.getTAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
-                TDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataAttribute_TypeKind(), this.getAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
+                DataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tDataObjectEClass, TDataObject.class, "TDataObject", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( dataObjectEClass, DataObject.class, "DataObject", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTDataObject_DsPresCond(), this.getTPresenceConditionName(), "dsPresCond", "M", 0, 1,
-                TDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataObject_DsPresCond(), ecorePackage.getEString(), "dsPresCond", "M", 0, 1,
+                DataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataObject_DsPresCondArgs(), this.getTPresenceConditionArgument(), "dsPresCondArgs", null,
-                0, 1, TDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataObject_DsPresCondArgs(), ecorePackage.getEString(), "dsPresCondArgs", null, 0, 1,
+                DataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataObject_DsPresCondArgsID(), this.getTDocID(), "dsPresCondArgsID", null, 0, 1,
-                TDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataObject_DsPresCondArgsID(), ecorePackage.getEString(), "dsPresCondArgsID", null, 0, 1,
+                DataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataObject_Name(), this.getTDataObjectName(), "name", null, 1, 1, TDataObject.class,
+        initEAttribute( getDataObject_Name(), ecorePackage.getEString(), "name", null, 1, 1, DataObject.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTDataObject_PresCond(), this.getTPresenceConditionName(), "presCond", "M", 0, 1,
-                TDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataObject_PresCondArgs(), this.getTPresenceConditionArgument(), "presCondArgs", null, 0, 1,
-                TDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataObject_PresCond(), ecorePackage.getEString(), "presCond", "M", 0, 1, DataObject.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getDataObject_PresCondArgs(), ecorePackage.getEString(), "presCondArgs", null, 0, 1,
+                DataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataObject_PresCondArgsID(), this.getTDocID(), "presCondArgsID", null, 0, 1,
-                TDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataObject_PresCondArgsID(), ecorePackage.getEString(), "presCondArgsID", null, 0, 1,
+                DataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataObject_Transient(), theXMLTypePackage.getBoolean(), "transient", "false", 0, 1,
-                TDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataObject_Transient(), theXMLTypePackage.getBoolean(), "transient", "false", 0, 1,
+                DataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataObject_Type(), this.getTCDCName(), "type", null, 1, 1, TDataObject.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataObject_UnderlyingType(), this.getTIec61850Name(), "underlyingType", null, 0, 1,
-                TDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDataObject_Type(), ecorePackage.getEString(), "type", null, 1, 1, DataObject.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED );
+        initEAttribute( getDataObject_UnderlyingType(), ecorePackage.getEString(), "underlyingType", null, 0, 1,
+                DataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDataObject_UnderlyingTypeKind(), this.getTDefinedAttributeTypeKind(), "underlyingTypeKind",
-                null, 0, 1, TDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getDataObject_UnderlyingTypeKind(), this.getDefinedAttributeTypeKind(), "underlyingTypeKind",
+                null, 0, 1, DataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tDataSetMemberOfEClass, TDataSetMemberOf.class, "TDataSetMemberOf", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( dataSetMemberOfEClass, DataSetMemberOf.class, "DataSetMemberOf", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTDataSetMemberOf_Cb(), this.getTCBKind(), "cb", null, 1, 1, TDataSetMemberOf.class,
+        initEAttribute( getDataSetMemberOf_Cb(), this.getCBKind(), "cb", null, 1, 1, DataSetMemberOf.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tDocEClass, TDoc.class, "TDoc", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTDoc_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, TDoc.class,
+        initEClass( docEClass, Doc.class, "Doc", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getDoc_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, Doc.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTDoc_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, TDoc.class,
+        initEAttribute( getDoc_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, Doc.class,
                 IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDoc_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, TDoc.class, IS_TRANSIENT,
+        initEAttribute( getDoc_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, Doc.class, IS_TRANSIENT,
                 IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDoc_Id(), this.getTDocID(), "id", null, 1, 1, TDoc.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getDoc_Id(), ecorePackage.getEString(), "id", null, 1, 1, Doc.class, !IS_TRANSIENT,
+                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tDocumentedClassEClass, TDocumentedClass.class, "TDocumentedClass", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( documentedClassEClass, DocumentedClass.class, "DocumentedClass", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTDocumentedClass_Deprecated(), theXMLTypePackage.getBoolean(), "deprecated", "false", 0, 1,
-                TDocumentedClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDocumentedClass_Deprecated(), theXMLTypePackage.getBoolean(), "deprecated", "false", 0, 1,
+                DocumentedClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTDocumentedClass_DescID(), this.getTDocID(), "descID", null, 0, 1, TDocumentedClass.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-                IS_ORDERED );
-        initEAttribute( getTDocumentedClass_Informative(), theXMLTypePackage.getBoolean(), "informative", "false", 0, 1,
-                TDocumentedClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getDocumentedClass_DescID(), ecorePackage.getEString(), "descID", null, 0, 1,
+                DocumentedClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getDocumentedClass_Informative(), theXMLTypePackage.getBoolean(), "informative", "false", 0, 1,
+                DocumentedClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tEnumerationEClass, TEnumeration.class, "TEnumeration", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( enumerationEClass, Enumeration.class, "Enumeration", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTEnumeration_Literal(), this.getTLiteral(), null, "literal", null, 1, -1, TEnumeration.class,
+        initEReference( getEnumeration_Literal(), this.getLiteral(), null, "literal", null, 1, -1, Enumeration.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTEnumeration_InheritedFrom(), this.getTIec61850Name(), "inheritedFrom", null, 0, 1,
-                TEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getEnumeration_InheritedFrom(), ecorePackage.getEString(), "inheritedFrom", null, 0, 1,
+                Enumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTEnumeration_Name(), this.getTIec61850Name(), "name", null, 1, 1, TEnumeration.class,
+        initEAttribute( getEnumeration_Name(), ecorePackage.getEString(), "name", null, 1, 1, Enumeration.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
 
-        initEClass( tEnumerationsEClass, TEnumerations.class, "TEnumerations", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( enumerationsEClass, Enumerations.class, "Enumerations", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTEnumerations_Enumeration(), this.getTEnumeration(), null, "enumeration", null, 0, -1,
-                TEnumerations.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getEnumerations_Enumeration(), this.getEnumeration(), null, "enumeration", null, 0, -1,
+                Enumerations.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tFunctionalConstraintEClass, TFunctionalConstraint.class, "TFunctionalConstraint", !IS_ABSTRACT,
+        initEClass( functionalConstraintEClass, FunctionalConstraint.class, "FunctionalConstraint", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTFunctionalConstraint_ApplicableServices(), this.getTApplicableServices(), null,
-                "applicableServices", null, 0, 1, TFunctionalConstraint.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEReference( getFunctionalConstraint_ApplicableServices(), this.getApplicableServices(), null,
+                "applicableServices", null, 0, 1, FunctionalConstraint.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTFunctionalConstraint_Abbreviation(), this.getTFCAbbreviation(), "abbreviation", null, 1, 1,
-                TFunctionalConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getFunctionalConstraint_Abbreviation(), ecorePackage.getEString(), "abbreviation", null, 1, 1,
+                FunctionalConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTFunctionalConstraint_DescID(), this.getTDocID(), "descID", null, 0, 1,
-                TFunctionalConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getFunctionalConstraint_DescID(), ecorePackage.getEString(), "descID", null, 0, 1,
+                FunctionalConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTFunctionalConstraint_TitleID(), this.getTDocID(), "titleID", null, 0, 1,
-                TFunctionalConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getFunctionalConstraint_TitleID(), ecorePackage.getEString(), "titleID", null, 0, 1,
+                FunctionalConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tFunctionalConstraintsEClass, TFunctionalConstraints.class, "TFunctionalConstraints", !IS_ABSTRACT,
+        initEClass( functionalConstraintsEClass, FunctionalConstraints.class, "FunctionalConstraints", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTFunctionalConstraints_FunctionalConstraint(), this.getTFunctionalConstraint(), null,
-                "functionalConstraint", null, 1, -1, TFunctionalConstraints.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEReference( getFunctionalConstraints_FunctionalConstraint(), this.getFunctionalConstraint(), null,
+                "functionalConstraint", null, 1, -1, FunctionalConstraints.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tLicenseEClass, TLicense.class, "TLicense", !IS_ABSTRACT, !IS_INTERFACE,
-                IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTLicense_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, TLicense.class,
+        initEClass( licenseEClass, License.class, "License", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getLicense_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, License.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTLicense_Kind(), this.getTLicenseKind(), "kind", null, 0, 1, TLicense.class, !IS_TRANSIENT,
+        initEAttribute( getLicense_Kind(), this.getLicenseKind(), "kind", null, 0, 1, License.class, !IS_TRANSIENT,
                 !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTLicense_Uri(), theXMLTypePackage.getNormalizedString(), "uri", null, 0, 1, TLicense.class,
+        initEAttribute( getLicense_Uri(), theXMLTypePackage.getNormalizedString(), "uri", null, 0, 1, License.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
 
-        initEClass( tLiteralEClass, TLiteral.class, "TLiteral", !IS_ABSTRACT, !IS_INTERFACE,
-                IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTLiteral_LiteralVal(), theXMLTypePackage.getInt(), "literalVal", null, 1, 1, TLiteral.class,
+        initEClass( literalEClass, Literal.class, "Literal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getLiteral_LiteralVal(), theXMLTypePackage.getInt(), "literalVal", null, 1, 1, Literal.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTLiteral_Name(), this.getTLiteralName(), "name", null, 1, 1, TLiteral.class, !IS_TRANSIENT,
+        initEAttribute( getLiteral_Name(), ecorePackage.getEString(), "name", null, 1, 1, Literal.class, !IS_TRANSIENT,
                 !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tlnClassEClass, TLNClass.class, "TLNClass", !IS_ABSTRACT, !IS_INTERFACE,
-                IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTLNClass_CanHaveLOG(), theXMLTypePackage.getBoolean(), "canHaveLOG", "false", 0, 1,
-                TLNClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEClass( lnClassEClass, LNClass.class, "LNClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getLNClass_CanHaveLOG(), theXMLTypePackage.getBoolean(), "canHaveLOG", "false", 0, 1,
+                LNClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTLNClass_IsExtension(), theXMLTypePackage.getBoolean(), "isExtension", "false", 0, 1,
-                TLNClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getLNClass_IsExtension(), theXMLTypePackage.getBoolean(), "isExtension", "false", 0, 1,
+                LNClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTLNClass_Name(), this.getTLNClassName(), "name", null, 1, 1, TLNClass.class, !IS_TRANSIENT,
+        initEAttribute( getLNClass_Name(), ecorePackage.getEString(), "name", null, 1, 1, LNClass.class, !IS_TRANSIENT,
                 !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tlnClassesEClass, TLNClasses.class, "TLNClasses", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( lnClassesEClass, LNClasses.class, "LNClasses", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTLNClasses_AbstractLNClass(), this.getTAbstractLNClass(), null, "abstractLNClass", null, 0,
-                -1, TLNClasses.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getLNClasses_AbstractLNClass(), this.getAbstractLNClass(), null, "abstractLNClass", null, 0, -1,
+                LNClasses.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTLNClasses_LNClass(), this.getTLNClass(), null, "lNClass", null, 0, -1, TLNClasses.class,
+        initEReference( getLNClasses_LNClass(), this.getLNClass(), null, "lNClass", null, 0, -1, LNClasses.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tNoticeEClass, TNotice.class, "TNotice", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTNotice_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, TNotice.class,
+        initEClass( noticeEClass, Notice.class, "Notice", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getNotice_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, Notice.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
 
-        initEClass( tnsEClass, fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, "TNS", !IS_ABSTRACT,
+        initEClass( nsEClass, fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, "NS", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTNS_Changes(), this.getTChanges(), null, "changes", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getNS_Changes(), this.getChanges(), null, "changes", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTNS_DependsOn(), this.getDependsOnType(), null, "dependsOn", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getNS_DependsOn(), this.getDependsOnType(), null, "dependsOn", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTNS_BasicTypes(), this.getTBasicTypes(), null, "basicTypes", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getNS_BasicTypes(), this.getBasicTypes(), null, "basicTypes", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTNS_FunctionalConstraints(), this.getTFunctionalConstraints(), null, "functionalConstraints",
-                null, 0, 1, fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEReference( getNS_FunctionalConstraints(), this.getFunctionalConstraints(), null, "functionalConstraints",
+                null, 0, 1, fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTNS_PresenceConditions(), this.getTPresenceConditions(), null, "presenceConditions", null, 0,
-                1, fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getNS_PresenceConditions(), this.getPresenceConditions(), null, "presenceConditions", null, 0,
+                1, fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTNS_Abbreviations(), this.getTAbbreviations(), null, "abbreviations", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getNS_Abbreviations(), this.getAbbreviations(), null, "abbreviations", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTNS_Enumerations(), this.getTEnumerations(), null, "enumerations", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getNS_Enumerations(), this.getEnumerations(), null, "enumerations", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTNS_ConstructedAttributes(), this.getTConstructedAttributes(), null, "constructedAttributes",
-                null, 0, 1, fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEReference( getNS_ConstructedAttributes(), this.getConstructedAttributes(), null, "constructedAttributes",
+                null, 0, 1, fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTNS_CDCs(), this.getTCDCs(), null, "cDCs", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getNS_CDCs(), this.getCDCs(), null, "cDCs", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTNS_LNClasses(), this.getTLNClasses(), null, "lNClasses", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getNS_LNClasses(), this.getLNClasses(), null, "lNClasses", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNS_DescID(), this.getTDocID(), "descID", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getNS_DescID(), ecorePackage.getEString(), "descID", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNS_Id(), this.getTNSIdentifier(), "id", null, 1, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getNS_Id(), ecorePackage.getEString(), "id", null, 1, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNS_PublicationStage(), this.getTPubStage(), "publicationStage", "IS", 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getNS_PublicationStage(), this.getPubStage(), "publicationStage", "IS", 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNS_Release(), this.getTNSRelease(), "release", "1", 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getNS_Revision(), ecorePackage.getEString(), "revision", "A", 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNS_Revision(), this.getTNSRevision(), "revision", "A", 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNS_UmlDate(), theXMLTypePackage.getDateTime(), "umlDate", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getNS_UmlDate(), theXMLTypePackage.getDateTime(), "umlDate", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNS_UmlVersion(), this.getTUMLVersion(), "umlVersion", null, 0, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEAttribute( getNS_UmlVersion(), ecorePackage.getEString(), "umlVersion", null, 0, 1,
+                fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNS_Version(), this.getTNSVersion(), "version", null, 1, 1,
-                fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tnsDocEClass, TNSDoc.class, "TNSDoc", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTNSDoc_Doc(), this.getTDoc(), null, "doc", null, 1, -1, TNSDoc.class, !IS_TRANSIENT,
+        initEClass( nsDocEClass, NSDoc.class, "NSDoc", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEReference( getNSDoc_Doc(), this.getDoc(), null, "doc", null, 1, -1, NSDoc.class, !IS_TRANSIENT,
                 !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTNSDoc_Id(), this.getTNSIdentifier(), "id", null, 1, 1, TNSDoc.class, !IS_TRANSIENT,
+        initEAttribute( getNSDoc_Id(), ecorePackage.getEString(), "id", null, 1, 1, NSDoc.class, !IS_TRANSIENT,
                 !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNSDoc_Lang(), theXMLTypePackage.getLanguage(), "lang", null, 1, 1, TNSDoc.class,
+        initEAttribute( getNSDoc_Lang(), theXMLTypePackage.getLanguage(), "lang", null, 1, 1, NSDoc.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTNSDoc_PublicationStage(), this.getTPubStage(), "publicationStage", "IS", 0, 1, TNSDoc.class,
+        initEAttribute( getNSDoc_PublicationStage(), this.getPubStage(), "publicationStage", "IS", 0, 1, NSDoc.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNSDoc_Release(), this.getTNSRelease(), "release", "1", 0, 1, TNSDoc.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNSDoc_Revision(), this.getTNSRevision(), "revision", "A", 0, 1, TNSDoc.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTNSDoc_UmlDate(), theXMLTypePackage.getDateTime(), "umlDate", null, 0, 1, TNSDoc.class,
+        initEAttribute( getNSDoc_Revision(), ecorePackage.getEString(), "revision", "A", 0, 1, NSDoc.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getNSDoc_UmlDate(), theXMLTypePackage.getDateTime(), "umlDate", null, 0, 1, NSDoc.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTNSDoc_UmlVersion(), this.getTUMLVersion(), "umlVersion", null, 0, 1, TNSDoc.class,
+        initEAttribute( getNSDoc_UmlVersion(), ecorePackage.getEString(), "umlVersion", null, 0, 1, NSDoc.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTNSDoc_Version(), this.getTNSVersion(), "version", null, 1, 1, TNSDoc.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tPresenceConditionEClass, TPresenceCondition.class, "TPresenceCondition", !IS_ABSTRACT,
-                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTPresenceCondition_Argument(), this.getTPresenceConditionArgument(), "argument", null, 0, 1,
-                TPresenceCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEClass( presenceConditionEClass, PresenceCondition.class, "PresenceCondition", !IS_ABSTRACT, !IS_INTERFACE,
+                IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getPresenceCondition_Argument(), ecorePackage.getEString(), "argument", null, 0, 1,
+                PresenceCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTPresenceCondition_DescID(), this.getTDocID(), "descID", null, 0, 1,
-                TPresenceCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getPresenceCondition_DescID(), ecorePackage.getEString(), "descID", null, 0, 1,
+                PresenceCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTPresenceCondition_Name(), this.getTPresenceConditionName(), "name", null, 1, 1,
-                TPresenceCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getPresenceCondition_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+                PresenceCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTPresenceCondition_TitleID(), this.getTDocID(), "titleID", null, 0, 1,
-                TPresenceCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getPresenceCondition_TitleID(), ecorePackage.getEString(), "titleID", null, 0, 1,
+                PresenceCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tPresenceConditionsEClass, TPresenceConditions.class, "TPresenceConditions", !IS_ABSTRACT,
+        initEClass( presenceConditionsEClass, PresenceConditions.class, "PresenceConditions", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTPresenceConditions_PresenceCondition(), this.getTPresenceCondition(), null,
-                "presenceCondition", null, 1, -1, TPresenceConditions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getPresenceConditions_PresenceCondition(), this.getPresenceCondition(), null,
+                "presenceCondition", null, 1, -1, PresenceConditions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tServiceCDCEClass, TServiceCDC.class, "TServiceCDC", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( serviceCDCEClass, ServiceCDC.class, "ServiceCDC", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTServiceCDC_ServiceDataAttribute(), this.getTServiceDataAttribute(), null,
-                "serviceDataAttribute", null, 1, -1, TServiceCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getServiceCDC_ServiceDataAttribute(), this.getServiceDataAttribute(), null,
+                "serviceDataAttribute", null, 1, -1, ServiceCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceCDC_Cdc(), this.getTCDCName(), "cdc", null, 1, 1, TServiceCDC.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceCDC_Variant(), theXMLTypePackage.getToken(), "variant", null, 0, 1,
-                TServiceCDC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getServiceCDC_Cdc(), ecorePackage.getEString(), "cdc", null, 1, 1, ServiceCDC.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED );
+        initEAttribute( getServiceCDC_Variant(), theXMLTypePackage.getToken(), "variant", null, 0, 1, ServiceCDC.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED );
 
-        initEClass( tServiceCDCsEClass, TServiceCDCs.class, "TServiceCDCs", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( serviceCDCsEClass, ServiceCDCs.class, "ServiceCDCs", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTServiceCDCs_ServiceCDC(), this.getTServiceCDC(), null, "serviceCDC", null, 0, -1,
-                TServiceCDCs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getServiceCDCs_ServiceCDC(), this.getServiceCDC(), null, "serviceCDC", null, 0, -1,
+                ServiceCDCs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tServiceConstructedAttributeEClass, TServiceConstructedAttribute.class,
-                "TServiceConstructedAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTServiceConstructedAttribute_TypeKindParameterized(), theXMLTypePackage.getBoolean(),
-                "typeKindParameterized", "false", 0, 1, TServiceConstructedAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEClass( serviceConstructedAttributeEClass, ServiceConstructedAttribute.class, "ServiceConstructedAttribute",
+                !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getServiceConstructedAttribute_TypeKindParameterized(), theXMLTypePackage.getBoolean(),
+                "typeKindParameterized", "false", 0, 1, ServiceConstructedAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tServiceConstructedAttributesEClass, TServiceConstructedAttributes.class,
-                "TServiceConstructedAttributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTServiceConstructedAttributes_ServiceConstructedAttribute(),
-                this.getTServiceConstructedAttribute(), null, "serviceConstructedAttribute", null, 0, -1,
-                TServiceConstructedAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        initEClass( serviceConstructedAttributesEClass, ServiceConstructedAttributes.class,
+                "ServiceConstructedAttributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEReference( getServiceConstructedAttributes_ServiceConstructedAttribute(),
+                this.getServiceConstructedAttribute(), null, "serviceConstructedAttribute", null, 0, -1,
+                ServiceConstructedAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
                 !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tServiceDataAttributeEClass, TServiceDataAttribute.class, "TServiceDataAttribute", !IS_ABSTRACT,
+        initEClass( serviceDataAttributeEClass, ServiceDataAttribute.class, "ServiceDataAttribute", !IS_ABSTRACT,
                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTServiceDataAttribute_Fc(), this.getTFCAbbreviation(), "fc", null, 1, 1,
-                TServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceDataAttribute_Fc(), ecorePackage.getEString(), "fc", null, 1, 1,
+                ServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceDataAttribute_Name(), this.getTAttributeName(), "name", null, 1, 1,
-                TServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceDataAttribute_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+                ServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceDataAttribute_PresCond(), this.getTPresenceConditionName(), "presCond", "M", 0, 1,
-                TServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceDataAttribute_PresCond(), ecorePackage.getEString(), "presCond", "M", 0, 1,
+                ServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceDataAttribute_PresCondArgs(), this.getTPresenceConditionArgument(), "presCondArgs",
-                null, 0, 1, TServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceDataAttribute_PresCondArgsID(), this.getTDocID(), "presCondArgsID", null, 0, 1,
-                TServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceDataAttribute_PresCondArgs(), ecorePackage.getEString(), "presCondArgs", null, 0, 1,
+                ServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceDataAttribute_Type(), this.getTIec61850Name(), "type", null, 0, 1,
-                TServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceDataAttribute_PresCondArgsID(), ecorePackage.getEString(), "presCondArgsID", null, 0,
+                1, ServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceDataAttribute_TypeKind(), this.getTAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
-                TServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceDataAttribute_Type(), ecorePackage.getEString(), "type", null, 0, 1,
+                ServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceDataAttribute_UnderlyingType(), this.getTIec61850Name(), "underlyingType", null, 0,
-                1, TServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceDataAttribute_TypeKind(), this.getAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
+                ServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceDataAttribute_UnderlyingTypeKind(), this.getTDefinedAttributeTypeKind(),
-                "underlyingTypeKind", null, 0, 1, TServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEAttribute( getServiceDataAttribute_UnderlyingType(), ecorePackage.getEString(), "underlyingType", null, 0,
+                1, ServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getServiceDataAttribute_UnderlyingTypeKind(), this.getDefinedAttributeTypeKind(),
+                "underlyingTypeKind", null, 0, 1, ServiceDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tServiceNSEClass, TServiceNS.class, "TServiceNS", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( serviceNSEClass, ServiceNS.class, "ServiceNS", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTServiceNS_Changes(), this.getTChanges(), null, "changes", null, 0, 1, TServiceNS.class,
+        initEReference( getServiceNS_Changes(), this.getChanges(), null, "changes", null, 0, 1, ServiceNS.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTServiceNS_FunctionalConstraints(), this.getTFunctionalConstraints(), null,
-                "functionalConstraints", null, 0, 1, TServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getServiceNS_FunctionalConstraints(), this.getFunctionalConstraints(), null,
+                "functionalConstraints", null, 0, 1, ServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTServiceNS_PresenceConditions(), this.getTPresenceConditions(), null, "presenceConditions",
-                null, 0, 1, TServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        initEReference( getServiceNS_PresenceConditions(), this.getPresenceConditions(), null, "presenceConditions",
+                null, 0, 1, ServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
                 !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTServiceNS_Abbreviations(), this.getTAbbreviations(), null, "abbreviations", null, 0, 1,
-                TServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getServiceNS_Abbreviations(), this.getAbbreviations(), null, "abbreviations", null, 0, 1,
+                ServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTServiceNS_ServiceTypeRealizations(), this.getTServiceTypeRealizations(), null,
-                "serviceTypeRealizations", null, 0, 1, TServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        initEReference( getServiceNS_ServiceTypeRealizations(), this.getServiceTypeRealizations(), null,
+                "serviceTypeRealizations", null, 0, 1, ServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTServiceNS_ServiceConstructedAttributes(), this.getTServiceConstructedAttributes(), null,
-                "serviceConstructedAttributes", null, 0, 1, TServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEReference( getTServiceNS_ServiceCDCs(), this.getTServiceCDCs(), null, "serviceCDCs", null, 0, 1,
-                TServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getServiceNS_ServiceConstructedAttributes(), this.getServiceConstructedAttributes(), null,
+                "serviceConstructedAttributes", null, 0, 1, ServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEReference( getServiceNS_ServiceCDCs(), this.getServiceCDCs(), null, "serviceCDCs", null, 0, 1,
+                ServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNS_DescID(), this.getTDocID(), "descID", null, 0, 1, TServiceNS.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNS_Id(), this.getTNSIdentifier(), "id", null, 1, 1, TServiceNS.class, !IS_TRANSIENT,
+        initEAttribute( getServiceNS_DescID(), ecorePackage.getEString(), "descID", null, 0, 1, ServiceNS.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED );
+        initEAttribute( getServiceNS_Id(), ecorePackage.getEString(), "id", null, 1, 1, ServiceNS.class, !IS_TRANSIENT,
                 !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNS_PublicationStage(), this.getTPubStage(), "publicationStage", "IS", 0, 1,
-                TServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getServiceNS_PublicationStage(), this.getPubStage(), "publicationStage", "IS", 0, 1,
+                ServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNS_Release(), this.getTNSRelease(), "release", "1", 0, 1, TServiceNS.class,
+        initEAttribute( getServiceNS_Revision(), ecorePackage.getEString(), "revision", "A", 0, 1, ServiceNS.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNS_Revision(), this.getTNSRevision(), "revision", "A", 0, 1, TServiceNS.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNS_UmlDate(), theXMLTypePackage.getDateTime(), "umlDate", null, 0, 1,
-                TServiceNS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNS_UmlVersion(), this.getTUMLVersion(), "umlVersion", null, 0, 1, TServiceNS.class,
+        initEAttribute( getServiceNS_UmlDate(), theXMLTypePackage.getDateTime(), "umlDate", null, 0, 1, ServiceNS.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED );
+        initEAttribute( getServiceNS_UmlVersion(), ecorePackage.getEString(), "umlVersion", null, 0, 1, ServiceNS.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTServiceNS_Version(), this.getTNSVersion(), "version", null, 1, 1, TServiceNS.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tServiceNsUsageEClass, TServiceNsUsage.class, "TServiceNsUsage", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( serviceNsUsageEClass, ServiceNsUsage.class, "ServiceNsUsage", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTServiceNsUsage_AppliesTo(), this.getAppliesToType(), null, "appliesTo", null, 1, -1,
-                TServiceNsUsage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        initEReference( getServiceNsUsage_AppliesTo(), this.getAppliesToType(), null, "appliesTo", null, 1, -1,
+                ServiceNsUsage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNsUsage_Id(), this.getTNSIdentifier(), "id", null, 1, 1, TServiceNsUsage.class,
+        initEAttribute( getServiceNsUsage_Id(), ecorePackage.getEString(), "id", null, 1, 1, ServiceNsUsage.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTServiceNsUsage_PublicationStage(), this.getTPubStage(), "publicationStage", "IS", 0, 1,
-                TServiceNsUsage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNsUsage_Release(), this.getTNSRelease(), "release", "1", 0, 1, TServiceNsUsage.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNsUsage_Revision(), this.getTNSRevision(), "revision", "A", 0, 1,
-                TServiceNsUsage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getServiceNsUsage_PublicationStage(), this.getPubStage(), "publicationStage", "IS", 0, 1,
+                ServiceNsUsage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceNsUsage_Version(), this.getTNSVersion(), "version", null, 1, 1,
-                TServiceNsUsage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getServiceNsUsage_Revision(), ecorePackage.getEString(), "revision", "A", 0, 1,
+                ServiceNsUsage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tServiceParameterEClass, TServiceParameter.class, "TServiceParameter", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( serviceParameterEClass, ServiceParameter.class, "ServiceParameter", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTServiceParameter_DefaultValue(), theXMLTypePackage.getNormalizedString(), "defaultValue",
-                null, 0, 1, TServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceParameter_DefaultValue(), theXMLTypePackage.getNormalizedString(), "defaultValue",
+                null, 0, 1, ServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceParameter_MaxValue(), theXMLTypePackage.getDecimal(), "maxValue", null, 0, 1,
-                TServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getServiceParameter_MaxValue(), theXMLTypePackage.getDecimal(), "maxValue", null, 0, 1,
+                ServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceParameter_MinValue(), theXMLTypePackage.getDecimal(), "minValue", null, 0, 1,
-                TServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getServiceParameter_MinValue(), theXMLTypePackage.getDecimal(), "minValue", null, 0, 1,
+                ServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceParameter_Name(), this.getTAttributeName(), "name", null, 1, 1,
-                TServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getServiceParameter_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+                ServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceParameter_Type(), this.getTIec61850Name(), "type", null, 0, 1,
-                TServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getServiceParameter_Type(), ecorePackage.getEString(), "type", null, 0, 1,
+                ServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceParameter_TypeKind(), this.getTAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
-                TServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getServiceParameter_TypeKind(), this.getAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
+                ServiceParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tServiceTypeRealizationEClass, TServiceTypeRealization.class, "TServiceTypeRealization",
-                !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTServiceTypeRealization_Fc(), this.getTFCAbbreviation(), "fc", null, 1, 1,
-                TServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEClass( serviceTypeRealizationEClass, ServiceTypeRealization.class, "ServiceTypeRealization", !IS_ABSTRACT,
+                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getServiceTypeRealization_Fc(), ecorePackage.getEString(), "fc", null, 1, 1,
+                ServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceTypeRealization_Name(), this.getTAttributeName(), "name", null, 1, 1,
-                TServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceTypeRealization_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+                ServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceTypeRealization_PresCond(), this.getTPresenceConditionName(), "presCond", "M", 0, 1,
-                TServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceTypeRealization_PresCond(), ecorePackage.getEString(), "presCond", "M", 0, 1,
+                ServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceTypeRealization_PresCondArgs(), this.getTPresenceConditionArgument(), "presCondArgs",
-                null, 0, 1, TServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceTypeRealization_PresCondArgsID(), this.getTDocID(), "presCondArgsID", null, 0, 1,
-                TServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceTypeRealization_PresCondArgs(), ecorePackage.getEString(), "presCondArgs", null, 0, 1,
+                ServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceTypeRealization_Type(), this.getTIec61850Name(), "type", null, 0, 1,
-                TServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceTypeRealization_PresCondArgsID(), ecorePackage.getEString(), "presCondArgsID", null,
+                0, 1, ServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTServiceTypeRealization_TypeKind(), this.getTAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
-                TServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getServiceTypeRealization_Type(), ecorePackage.getEString(), "type", null, 0, 1,
+                ServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getServiceTypeRealization_TypeKind(), this.getAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
+                ServiceTypeRealization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tServiceTypeRealizationsEClass, TServiceTypeRealizations.class, "TServiceTypeRealizations",
+        initEClass( serviceTypeRealizationsEClass, ServiceTypeRealizations.class, "ServiceTypeRealizations",
                 !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
-        initEReference( getTServiceTypeRealizations_ServiceTypeRealization(), this.getTConstructedAttribute(), null,
-                "serviceTypeRealization", null, 0, -1, TServiceTypeRealizations.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEReference( getServiceTypeRealizations_ServiceTypeRealization(), this.getConstructedAttribute(), null,
+                "serviceTypeRealization", null, 0, -1, ServiceTypeRealizations.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tSubDataAttributeEClass, TSubDataAttribute.class, "TSubDataAttribute", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( subDataAttributeEClass, SubDataAttribute.class, "SubDataAttribute", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTSubDataAttribute_DefaultValue(), theXMLTypePackage.getNormalizedString(), "defaultValue",
-                null, 0, 1, TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getSubDataAttribute_DefaultValue(), theXMLTypePackage.getNormalizedString(), "defaultValue",
+                null, 0, 1, SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_IsArray(), theXMLTypePackage.getBoolean(), "isArray", "false", 0, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_IsArray(), theXMLTypePackage.getBoolean(), "isArray", "false", 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_MaxIndexAttribute(), this.getTAttributeName(), "maxIndexAttribute", null,
-                0, 1, TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        initEAttribute( getSubDataAttribute_MaxIndexAttribute(), ecorePackage.getEString(), "maxIndexAttribute", null,
+                0, 1, SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_MaxValue(), theXMLTypePackage.getDecimal(), "maxValue", null, 0, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_MaxValue(), theXMLTypePackage.getDecimal(), "maxValue", null, 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_MinIndex(), theXMLTypePackage.getUnsignedInt(), "minIndex", "0", 0, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_MinIndex(), theXMLTypePackage.getUnsignedInt(), "minIndex", "0", 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_MinValue(), theXMLTypePackage.getDecimal(), "minValue", null, 0, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_MinValue(), theXMLTypePackage.getDecimal(), "minValue", null, 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_Name(), this.getTAttributeName(), "name", null, 1, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_PresCond(), this.getTPresenceConditionName(), "presCond", "M", 0, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_PresCond(), ecorePackage.getEString(), "presCond", "M", 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_PresCondArgs(), this.getTPresenceConditionArgument(), "presCondArgs", null,
-                0, 1, TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_PresCondArgsID(), this.getTDocID(), "presCondArgsID", null, 0, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_PresCondArgs(), ecorePackage.getEString(), "presCondArgs", null, 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_SizeAttribute(), this.getTAttributeName(), "sizeAttribute", null, 0, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_PresCondArgsID(), ecorePackage.getEString(), "presCondArgsID", null, 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_Type(), this.getTIec61850Name(), "type", null, 0, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_SizeAttribute(), ecorePackage.getEString(), "sizeAttribute", null, 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataAttribute_TypeKind(), this.getTAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
-                TSubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataAttribute_Type(), ecorePackage.getEString(), "type", null, 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getSubDataAttribute_TypeKind(), this.getAttributeTypeKind(), "typeKind", "BASIC", 0, 1,
+                SubDataAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tSubDataObjectEClass, TSubDataObject.class, "TSubDataObject", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( subDataObjectEClass, SubDataObject.class, "SubDataObject", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTSubDataObject_IsArray(), theXMLTypePackage.getBoolean(), "isArray", "false", 0, 1,
-                TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataObject_MaxIndexAttribute(), this.getTAttributeName(), "maxIndexAttribute", null, 0,
-                1, TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataObject_IsArray(), theXMLTypePackage.getBoolean(), "isArray", "false", 0, 1,
+                SubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataObject_MinIndex(), theXMLTypePackage.getUnsignedInt(), "minIndex", "0", 0, 1,
-                TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataObject_MaxIndexAttribute(), ecorePackage.getEString(), "maxIndexAttribute", null, 0,
+                1, SubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataObject_Name(), this.getTSubDataObjectName(), "name", null, 1, 1,
-                TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataObject_MinIndex(), theXMLTypePackage.getUnsignedInt(), "minIndex", "0", 0, 1,
+                SubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataObject_PresCond(), this.getTPresenceConditionName(), "presCond", "M", 0, 1,
-                TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataObject_Name(), ecorePackage.getEString(), "name", null, 1, 1, SubDataObject.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+                IS_ORDERED );
+        initEAttribute( getSubDataObject_PresCond(), ecorePackage.getEString(), "presCond", "M", 0, 1,
+                SubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataObject_PresCondArgs(), this.getTPresenceConditionArgument(), "presCondArgs", null, 0,
-                1, TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataObject_PresCondArgs(), ecorePackage.getEString(), "presCondArgs", null, 0, 1,
+                SubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataObject_PresCondArgsID(), this.getTDocID(), "presCondArgsID", null, 0, 1,
-                TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataObject_PresCondArgsID(), ecorePackage.getEString(), "presCondArgsID", null, 0, 1,
+                SubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataObject_SizeAttribute(), this.getTAttributeName(), "sizeAttribute", null, 0, 1,
-                TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataObject_SizeAttribute(), ecorePackage.getEString(), "sizeAttribute", null, 0, 1,
+                SubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataObject_Type(), this.getTCDCName(), "type", null, 1, 1, TSubDataObject.class,
+        initEAttribute( getSubDataObject_Type(), ecorePackage.getEString(), "type", null, 1, 1, SubDataObject.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
-        initEAttribute( getTSubDataObject_UnderlyingType(), this.getTIec61850Name(), "underlyingType", null, 0, 1,
-                TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        initEAttribute( getSubDataObject_UnderlyingType(), ecorePackage.getEString(), "underlyingType", null, 0, 1,
+                SubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED );
-        initEAttribute( getTSubDataObject_UnderlyingTypeKind(), this.getTDefinedAttributeTypeKind(),
-                "underlyingTypeKind", null, 0, 1, TSubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getSubDataObject_UnderlyingTypeKind(), this.getDefinedAttributeTypeKind(), "underlyingTypeKind",
+                null, 0, 1, SubDataObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
+                IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
 
-        initEClass( tTitledClassEClass, TTitledClass.class, "TTitledClass", !IS_ABSTRACT, !IS_INTERFACE,
+        initEClass( titledClassEClass, TitledClass.class, "TitledClass", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEAttribute( getTTitledClass_TitleID(), this.getTDocID(), "titleID", null, 1, 1, TTitledClass.class,
+        initEAttribute( getTitledClass_TitleID(), ecorePackage.getEString(), "titleID", null, 1, 1, TitledClass.class,
                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED );
 
+        initEClass( nsdObjectWithVersionAndReleaseEClass, NSDObjectWithVersionAndRelease.class,
+                "NSDObjectWithVersionAndRelease", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS );
+        initEAttribute( getNSDObjectWithVersionAndRelease_Release(), ecorePackage.getEIntegerObject(), "release", "1",
+                0, 1, NSDObjectWithVersionAndRelease.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE,
+                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+        initEAttribute( getNSDObjectWithVersionAndRelease_Version(), ecorePackage.getEIntegerObject(), "version", null,
+                1, 1, NSDObjectWithVersionAndRelease.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE,
+                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
+
         // Initialize enums and add enum literals
-        initEEnum( tacsiServicesKindEEnum, TACSIServicesKind.class, "TACSIServicesKind" );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.ASSOCIATE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.ABORT );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.RELEASE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_SERVER_DIRECTORY );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_LOGICAL_DEVICE_DIRECTORY );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_ALL_DATA_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_DATA_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_DATA_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_DATA_DIRECTORY );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_DATA_DEFINITION );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_DATA_SET_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_DATA_SET_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.CREATE_DATA_SET );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.DELETE_DATA_SET );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_DATA_SET_DIRECTORY );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SELECT_ACTIVE_SG );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SELECT_EDIT_SG );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_EDIT_SG_VALUE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.CONFIRM_EDIT_SG_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_EDIT_SG_VALUE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_SGCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.REPORT );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_BRCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_BRCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_URCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_URCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_LCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_LCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.QUERY_LOG_BY_TIME );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.QUERY_LOG_AFTER );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_LOG_STATUS_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SEND_GOOSE_MESSAGE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_GO_CB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_GO_CB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_GO_REFERENCE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_GOOSE_ELEMENT_NUMBER );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SEND_MSV_MESSAGE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_MSVCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_MSVCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SEND_USV_MESSAGE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_USVCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_USVCB_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SELECT );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SELECT_WITH_VALUE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.CANCEL );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.OPERATE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.COMMAND_TERMINATION );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.TIME_ACTIVATED_OPERATE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_FILE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.SET_FILE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.DELETE_FILE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_FILE_ATTRIBUTE_VALUES );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.TIME_SYNCHRONIZATION );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.INTERNAL_CHANGE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_LOGICAL_NODE_DIRECTORY );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_MSV_REFERENCE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_MSV_ELEMENT_NUMBER );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_USV_REFERENCE );
-        addEEnumLiteral( tacsiServicesKindEEnum, TACSIServicesKind.GET_USV_ELEMENT_NUMBER );
-
-        initEEnum( tcbKindEEnum, TCBKind.class, "TCBKind" );
-        addEEnumLiteral( tcbKindEEnum, TCBKind.RCB );
-        addEEnumLiteral( tcbKindEEnum, TCBKind.LCB );
-        addEEnumLiteral( tcbKindEEnum, TCBKind.GO_CB );
-        addEEnumLiteral( tcbKindEEnum, TCBKind.SVCB );
-
-        initEEnum( tDefinedAttributeTypeKindEEnum, TDefinedAttributeTypeKind.class, "TDefinedAttributeTypeKind" );
-        addEEnumLiteral( tDefinedAttributeTypeKindEEnum, TDefinedAttributeTypeKind.BASIC );
-        addEEnumLiteral( tDefinedAttributeTypeKindEEnum, TDefinedAttributeTypeKind.ENUMERATED );
-        addEEnumLiteral( tDefinedAttributeTypeKindEEnum, TDefinedAttributeTypeKind.CONSTRUCTED );
-
-        initEEnum( tLicenseKindEEnum, TLicenseKind.class, "TLicenseKind" );
-        addEEnumLiteral( tLicenseKindEEnum, TLicenseKind.STANDARD );
-        addEEnumLiteral( tLicenseKindEEnum, TLicenseKind.PRIVATE );
-        addEEnumLiteral( tLicenseKindEEnum, TLicenseKind.NONE );
-
-        initEEnum( tPubStageEEnum, TPubStage.class, "TPubStage" );
-        addEEnumLiteral( tPubStageEEnum, TPubStage.WD );
-        addEEnumLiteral( tPubStageEEnum, TPubStage.CD );
-        addEEnumLiteral( tPubStageEEnum, TPubStage.CDV );
-        addEEnumLiteral( tPubStageEEnum, TPubStage.DTS );
-        addEEnumLiteral( tPubStageEEnum, TPubStage.DTR );
-        addEEnumLiteral( tPubStageEEnum, TPubStage.FDIS );
-        addEEnumLiteral( tPubStageEEnum, TPubStage.TS );
-        addEEnumLiteral( tPubStageEEnum, TPubStage.TR );
-        addEEnumLiteral( tPubStageEEnum, TPubStage.IS );
-
-        initEEnum( tUndefinedAttributeTypeKindEEnum, TUndefinedAttributeTypeKind.class, "TUndefinedAttributeTypeKind" );
-        addEEnumLiteral( tUndefinedAttributeTypeKindEEnum, TUndefinedAttributeTypeKind.UNDEFINED );
+        initEEnum( acsiServicesKindEEnum, ACSIServicesKind.class, "ACSIServicesKind" );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.ASSOCIATE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.ABORT );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.RELEASE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_SERVER_DIRECTORY );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_LOGICAL_DEVICE_DIRECTORY );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_ALL_DATA_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_DATA_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_DATA_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_DATA_DIRECTORY );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_DATA_DEFINITION );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_DATA_SET_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_DATA_SET_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.CREATE_DATA_SET );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.DELETE_DATA_SET );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_DATA_SET_DIRECTORY );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SELECT_ACTIVE_SG );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SELECT_EDIT_SG );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_EDIT_SG_VALUE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.CONFIRM_EDIT_SG_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_EDIT_SG_VALUE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_SGCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.REPORT );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_BRCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_BRCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_URCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_URCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_LCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_LCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.QUERY_LOG_BY_TIME );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.QUERY_LOG_AFTER );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_LOG_STATUS_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SEND_GOOSE_MESSAGE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_GO_CB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_GO_CB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_GO_REFERENCE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_GOOSE_ELEMENT_NUMBER );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SEND_MSV_MESSAGE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_MSVCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_MSVCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SEND_USV_MESSAGE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_USVCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_USVCB_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SELECT );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SELECT_WITH_VALUE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.CANCEL );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.OPERATE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.COMMAND_TERMINATION );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.TIME_ACTIVATED_OPERATE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_FILE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.SET_FILE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.DELETE_FILE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_FILE_ATTRIBUTE_VALUES );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.TIME_SYNCHRONIZATION );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.INTERNAL_CHANGE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_LOGICAL_NODE_DIRECTORY );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_MSV_REFERENCE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_MSV_ELEMENT_NUMBER );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_USV_REFERENCE );
+        addEEnumLiteral( acsiServicesKindEEnum, ACSIServicesKind.GET_USV_ELEMENT_NUMBER );
+
+        initEEnum( cbKindEEnum, CBKind.class, "CBKind" );
+        addEEnumLiteral( cbKindEEnum, CBKind.RCB );
+        addEEnumLiteral( cbKindEEnum, CBKind.LCB );
+        addEEnumLiteral( cbKindEEnum, CBKind.GO_CB );
+        addEEnumLiteral( cbKindEEnum, CBKind.SVCB );
+
+        initEEnum( definedAttributeTypeKindEEnum, DefinedAttributeTypeKind.class, "DefinedAttributeTypeKind" );
+        addEEnumLiteral( definedAttributeTypeKindEEnum, DefinedAttributeTypeKind.BASIC );
+        addEEnumLiteral( definedAttributeTypeKindEEnum, DefinedAttributeTypeKind.ENUMERATED );
+        addEEnumLiteral( definedAttributeTypeKindEEnum, DefinedAttributeTypeKind.CONSTRUCTED );
+
+        initEEnum( licenseKindEEnum, LicenseKind.class, "LicenseKind" );
+        addEEnumLiteral( licenseKindEEnum, LicenseKind.STANDARD );
+        addEEnumLiteral( licenseKindEEnum, LicenseKind.PRIVATE );
+        addEEnumLiteral( licenseKindEEnum, LicenseKind.NONE );
+
+        initEEnum( pubStageEEnum, PubStage.class, "PubStage" );
+        addEEnumLiteral( pubStageEEnum, PubStage.WD );
+        addEEnumLiteral( pubStageEEnum, PubStage.CD );
+        addEEnumLiteral( pubStageEEnum, PubStage.CDV );
+        addEEnumLiteral( pubStageEEnum, PubStage.DTS );
+        addEEnumLiteral( pubStageEEnum, PubStage.DTR );
+        addEEnumLiteral( pubStageEEnum, PubStage.FDIS );
+        addEEnumLiteral( pubStageEEnum, PubStage.TS );
+        addEEnumLiteral( pubStageEEnum, PubStage.TR );
+        addEEnumLiteral( pubStageEEnum, PubStage.IS );
+
+        initEEnum( undefinedAttributeTypeKindEEnum, UndefinedAttributeTypeKind.class, "UndefinedAttributeTypeKind" );
+        addEEnumLiteral( undefinedAttributeTypeKindEEnum, UndefinedAttributeTypeKind.UNDEFINED );
 
         // Initialize data types
-        initEDataType( tAbbreviationNameEDataType, String.class, "TAbbreviationName", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tAbstractLNClassNameEDataType, String.class, "TAbstractLNClassName", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tacsiServicesKindObjectEDataType, TACSIServicesKind.class, "TACSIServicesKindObject",
+        initEDataType( acsiServicesKindObjectEDataType, ACSIServicesKind.class, "ACSIServicesKindObject",
                 IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tAttributeNameEDataType, String.class, "TAttributeName", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tAttributeTypeKindEDataType, Enumerator.class, "TAttributeTypeKind", IS_SERIALIZABLE,
+        initEDataType( attributeTypeKindEDataType, Enumerator.class, "AttributeTypeKind", IS_SERIALIZABLE,
                 !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tBasicTypeNameEDataType, String.class, "TBasicTypeName", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tcbKindObjectEDataType, TCBKind.class, "TCBKindObject", IS_SERIALIZABLE,
+        initEDataType( cbKindObjectEDataType, CBKind.class, "CBKindObject", IS_SERIALIZABLE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tcdcNameEDataType, String.class, "TCDCName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tDataObjectNameEDataType, String.class, "TDataObjectName", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tDefinedAttributeTypeKindObjectEDataType, TDefinedAttributeTypeKind.class,
-                "TDefinedAttributeTypeKindObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tDocIDEDataType, String.class, "TDocID", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tEmptyStringEDataType, String.class, "TEmptyString", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tfcAbbreviationEDataType, String.class, "TFCAbbreviation", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tIec61850NameEDataType, String.class, "TIec61850Name", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tIec61850NameStringEDataType, String.class, "TIec61850NameString", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tissuesTypeEDataType, String.class, "TissuesType", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tLicenseKindObjectEDataType, TLicenseKind.class, "TLicenseKindObject", IS_SERIALIZABLE,
+        initEDataType( definedAttributeTypeKindObjectEDataType, DefinedAttributeTypeKind.class,
+                "DefinedAttributeTypeKindObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS );
+        initEDataType( licenseKindObjectEDataType, LicenseKind.class, "LicenseKindObject", IS_SERIALIZABLE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tLiteralNameEDataType, String.class, "TLiteralName", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tlnClassNameEDataType, String.class, "TLNClassName", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tnsIdentifierEDataType, String.class, "TNSIdentifier", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tnsReleaseEDataType, short.class, "TNSRelease", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tnsReleaseObjectEDataType, Short.class, "TNSReleaseObject", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tnsRevisionEDataType, String.class, "TNSRevision", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tnsVersionEDataType, int.class, "TNSVersion", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tnsVersionObjectEDataType, Integer.class, "TNSVersionObject", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tPresenceConditionArgumentEDataType, String.class, "TPresenceConditionArgument", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tPresenceConditionNameEDataType, String.class, "TPresenceConditionName", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tPubStageObjectEDataType, TPubStage.class, "TPubStageObject", IS_SERIALIZABLE,
+        initEDataType( pubStageObjectEDataType, PubStage.class, "PubStageObject", IS_SERIALIZABLE,
                 IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tSubDataObjectNameEDataType, String.class, "TSubDataObjectName", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tumlVersionEDataType, String.class, "TUMLVersion", IS_SERIALIZABLE,
-                !IS_GENERATED_INSTANCE_CLASS );
-        initEDataType( tUndefinedAttributeTypeKindObjectEDataType, TUndefinedAttributeTypeKind.class,
-                "TUndefinedAttributeTypeKindObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS );
+        initEDataType( undefinedAttributeTypeKindObjectEDataType, UndefinedAttributeTypeKind.class,
+                "UndefinedAttributeTypeKindObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS );
 
         // Create resource
         createResource( eNS_URI );
@@ -5201,16 +4598,12 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
         addAnnotation( getAppliesToType_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
         addAnnotation( getAppliesToType_PublicationStage(), source,
                 new String[] { "kind", "attribute", "name", "publicationStage" } );
-        addAnnotation( getAppliesToType_Release(), source, new String[] { "kind", "attribute", "name", "release" } );
         addAnnotation( getAppliesToType_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
-        addAnnotation( getAppliesToType_Version(), source, new String[] { "kind", "attribute", "name", "version" } );
         addAnnotation( dependsOnTypeEClass, source, new String[] { "name", "DependsOn_._type", "kind", "empty" } );
         addAnnotation( getDependsOnType_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
         addAnnotation( getDependsOnType_PublicationStage(), source,
                 new String[] { "kind", "attribute", "name", "publicationStage" } );
-        addAnnotation( getDependsOnType_Release(), source, new String[] { "kind", "attribute", "name", "release" } );
         addAnnotation( getDependsOnType_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
-        addAnnotation( getDependsOnType_Version(), source, new String[] { "kind", "attribute", "name", "version" } );
         addAnnotation( documentRootEClass, source, new String[] { "name", "", "kind", "mixed" } );
         addAnnotation( getDocumentRoot_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } );
         addAnnotation( getDocumentRoot_XMLNSPrefixMap(), source,
@@ -5229,451 +4622,384 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
                 new String[] { "kind", "element", "name", "ServiceNS", "namespace", "##targetNamespace" } );
         addAnnotation( serviceTypeEClass, source, new String[] { "name", "Service_._type", "kind", "empty" } );
         addAnnotation( getServiceType_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( tAbbreviationEClass, source, new String[] { "name", "tAbbreviation", "kind", "empty" } );
-        addAnnotation( getTAbbreviation_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
-        addAnnotation( getTAbbreviation_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( tAbbreviationNameEDataType, source, new String[] { "name", "tAbbreviationName", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#normalizedString" } );
-        addAnnotation( tAbbreviationsEClass, source, new String[] { "name", "tAbbreviations", "kind", "elementOnly" } );
-        addAnnotation( getTAbbreviations_Abbreviation(), source,
+        addAnnotation( abbreviationEClass, source, new String[] { "name", "tAbbreviation", "kind", "empty" } );
+        addAnnotation( getAbbreviation_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
+        addAnnotation( getAbbreviation_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( abbreviationsEClass, source, new String[] { "name", "tAbbreviations", "kind", "elementOnly" } );
+        addAnnotation( getAbbreviations_Abbreviation(), source,
                 new String[] { "kind", "element", "name", "Abbreviation", "namespace", "##targetNamespace" } );
-        addAnnotation( tAbstractLNClassEClass, source,
+        addAnnotation( abstractLNClassEClass, source,
                 new String[] { "name", "tAbstractLNClass", "kind", "elementOnly" } );
-        addAnnotation( getTAbstractLNClass_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( tAbstractLNClassNameEDataType, source,
-                new String[] { "name", "tAbstractLNClassName", "baseType", "tIec61850Name" } );
-        addAnnotation( tacsiServicesKindEEnum, source, new String[] { "name", "tACSIServicesKind" } );
-        addAnnotation( tacsiServicesKindObjectEDataType, source,
+        addAnnotation( getAbstractLNClass_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( acsiServicesKindEEnum, source, new String[] { "name", "tACSIServicesKind" } );
+        addAnnotation( acsiServicesKindObjectEDataType, source,
                 new String[] { "name", "tACSIServicesKind:Object", "baseType", "tACSIServicesKind" } );
-        addAnnotation( tAnyLNClassEClass, source, new String[] { "name", "tAnyLNClass", "kind", "elementOnly" } );
-        addAnnotation( getTAnyLNClass_DataObject(), source,
+        addAnnotation( anyLNClassEClass, source, new String[] { "name", "tAnyLNClass", "kind", "elementOnly" } );
+        addAnnotation( getAnyLNClass_DataObject(), source,
                 new String[] { "kind", "element", "name", "DataObject", "namespace", "##targetNamespace" } );
-        addAnnotation( getTAnyLNClass_Base(), source, new String[] { "kind", "attribute", "name", "base" } );
-        addAnnotation( tApplicableServiceNSEClass, source,
+        addAnnotation( getAnyLNClass_Base(), source, new String[] { "kind", "attribute", "name", "base" } );
+        addAnnotation( applicableServiceNSEClass, source,
                 new String[] { "name", "tApplicableServiceNS", "kind", "elementOnly" } );
-        addAnnotation( getTApplicableServiceNS_ServiceNsUsage(), source,
+        addAnnotation( getApplicableServiceNS_ServiceNsUsage(), source,
                 new String[] { "kind", "element", "name", "ServiceNsUsage", "namespace", "##targetNamespace" } );
-        addAnnotation( getTApplicableServiceNS_Date(), source, new String[] { "kind", "attribute", "name", "date" } );
-        addAnnotation( getTApplicableServiceNS_Version(), source,
+        addAnnotation( getApplicableServiceNS_Date(), source, new String[] { "kind", "attribute", "name", "date" } );
+        addAnnotation( getApplicableServiceNS_Version(), source,
                 new String[] { "kind", "attribute", "name", "version" } );
-        addAnnotation( tApplicableServicesEClass, source,
+        addAnnotation( applicableServicesEClass, source,
                 new String[] { "name", "tApplicableServices", "kind", "elementOnly" } );
-        addAnnotation( getTApplicableServices_Service(), source,
+        addAnnotation( getApplicableServices_Service(), source,
                 new String[] { "kind", "element", "name", "Service", "namespace", "##targetNamespace" } );
-        addAnnotation( getTApplicableServices_DataSetMemberOf(), source,
+        addAnnotation( getApplicableServices_DataSetMemberOf(), source,
                 new String[] { "kind", "element", "name", "DataSetMemberOf", "namespace", "##targetNamespace" } );
-        addAnnotation( tAttributeNameEDataType, source,
-                new String[] { "name", "tAttributeName", "baseType", "tIec61850Name" } );
-        addAnnotation( tAttributeTypeKindEDataType, source, new String[] { "name", "tAttributeTypeKind", "memberTypes",
+        addAnnotation( attributeTypeKindEDataType, source, new String[] { "name", "tAttributeTypeKind", "memberTypes",
                 "tDefinedAttributeTypeKind tUndefinedAttributeTypeKind" } );
-        addAnnotation( tBasicTypeEClass, source, new String[] { "name", "tBasicType", "kind", "empty" } );
-        addAnnotation( getTBasicType_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
-        addAnnotation( getTBasicType_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( tBasicTypeNameEDataType, source, new String[] { "name", "tBasicTypeName", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#token", "minLength", "1" } );
-        addAnnotation( tBasicTypesEClass, source, new String[] { "name", "tBasicTypes", "kind", "elementOnly" } );
-        addAnnotation( getTBasicTypes_BasicType(), source,
+        addAnnotation( basicTypeEClass, source, new String[] { "name", "tBasicType", "kind", "empty" } );
+        addAnnotation( getBasicType_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
+        addAnnotation( getBasicType_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( basicTypesEClass, source, new String[] { "name", "tBasicTypes", "kind", "elementOnly" } );
+        addAnnotation( getBasicTypes_BasicType(), source,
                 new String[] { "kind", "element", "name", "BasicType", "namespace", "##targetNamespace" } );
-        addAnnotation( tcbKindEEnum, source, new String[] { "name", "tCBKind" } );
-        addAnnotation( tcbKindObjectEDataType, source,
+        addAnnotation( cbKindEEnum, source, new String[] { "name", "tCBKind" } );
+        addAnnotation( cbKindObjectEDataType, source,
                 new String[] { "name", "tCBKind:Object", "baseType", "tCBKind" } );
-        addAnnotation( tcdcEClass, source, new String[] { "name", "tCDC", "kind", "elementOnly" } );
-        addAnnotation( getTCDC_SubDataObject(), source,
+        addAnnotation( cdcEClass, source, new String[] { "name", "tCDC", "kind", "elementOnly" } );
+        addAnnotation( getCDC_SubDataObject(), source,
                 new String[] { "kind", "element", "name", "SubDataObject", "namespace", "##targetNamespace" } );
-        addAnnotation( getTCDC_DataAttribute(), source,
+        addAnnotation( getCDC_DataAttribute(), source,
                 new String[] { "kind", "element", "name", "DataAttribute", "namespace", "##targetNamespace" } );
-        addAnnotation( getTCDC_ServiceParameter(), source,
+        addAnnotation( getCDC_ServiceParameter(), source,
                 new String[] { "kind", "element", "name", "ServiceParameter", "namespace", "##targetNamespace" } );
-        addAnnotation( getTCDC_EnumParameterized(), source,
+        addAnnotation( getCDC_EnumParameterized(), source,
                 new String[] { "kind", "attribute", "name", "enumParameterized" } );
-        addAnnotation( getTCDC_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( getTCDC_Statistics(), source, new String[] { "kind", "attribute", "name", "statistics" } );
-        addAnnotation( getTCDC_TypeKindParameterized(), source,
+        addAnnotation( getCDC_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( getCDC_Statistics(), source, new String[] { "kind", "attribute", "name", "statistics" } );
+        addAnnotation( getCDC_TypeKindParameterized(), source,
                 new String[] { "kind", "attribute", "name", "typeKindParameterized" } );
-        addAnnotation( getTCDC_Variant(), source, new String[] { "kind", "attribute", "name", "variant" } );
-        addAnnotation( tcdcNameEDataType, source,
-                new String[] { "name", "tCDCName", "baseType", "tIec61850Name", "minLength", "1" } );
-        addAnnotation( tcdCsEClass, source, new String[] { "name", "tCDCs", "kind", "elementOnly" } );
-        addAnnotation( getTCDCs_CDC(), source,
+        addAnnotation( getCDC_Variant(), source, new String[] { "kind", "attribute", "name", "variant" } );
+        addAnnotation( cdCsEClass, source, new String[] { "name", "tCDCs", "kind", "elementOnly" } );
+        addAnnotation( getCDCs_CDC(), source,
                 new String[] { "kind", "element", "name", "CDC", "namespace", "##targetNamespace" } );
-        addAnnotation( tChangesEClass, source, new String[] { "name", "tChanges", "kind", "empty" } );
-        addAnnotation( getTChanges_ChangesID(), source, new String[] { "kind", "attribute", "name", "changesID" } );
-        addAnnotation( getTChanges_Date(), source, new String[] { "kind", "attribute", "name", "date" } );
-        addAnnotation( getTChanges_Release(), source, new String[] { "kind", "attribute", "name", "release" } );
-        addAnnotation( getTChanges_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
-        addAnnotation( getTChanges_Tissues(), source, new String[] { "kind", "attribute", "name", "tissues" } );
-        addAnnotation( getTChanges_Version(), source, new String[] { "kind", "attribute", "name", "version" } );
-        addAnnotation( tConstructedAttributeEClass, source,
+        addAnnotation( changesEClass, source, new String[] { "name", "tChanges", "kind", "empty" } );
+        addAnnotation( getChanges_ChangesID(), source, new String[] { "kind", "attribute", "name", "changesID" } );
+        addAnnotation( getChanges_Date(), source, new String[] { "kind", "attribute", "name", "date" } );
+        addAnnotation( getChanges_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
+        addAnnotation( getChanges_Tissues(), source, new String[] { "kind", "attribute", "name", "tissues" } );
+        addAnnotation( constructedAttributeEClass, source,
                 new String[] { "name", "tConstructedAttribute", "kind", "elementOnly" } );
-        addAnnotation( getTConstructedAttribute_SubDataAttribute(), source,
+        addAnnotation( getConstructedAttribute_SubDataAttribute(), source,
                 new String[] { "kind", "element", "name", "SubDataAttribute", "namespace", "##targetNamespace" } );
-        addAnnotation( getTConstructedAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( tConstructedAttributesEClass, source,
+        addAnnotation( getConstructedAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( constructedAttributesEClass, source,
                 new String[] { "name", "tConstructedAttributes", "kind", "elementOnly" } );
-        addAnnotation( getTConstructedAttributes_ConstructedAttribute(), source,
+        addAnnotation( getConstructedAttributes_ConstructedAttribute(), source,
                 new String[] { "kind", "element", "name", "ConstructedAttribute", "namespace", "##targetNamespace" } );
-        addAnnotation( tCopyrightedEClass, source, new String[] { "name", "tCopyrighted", "kind", "elementOnly" } );
-        addAnnotation( getTCopyrighted_Copyright(), source,
+        addAnnotation( copyrightedEClass, source, new String[] { "name", "tCopyrighted", "kind", "elementOnly" } );
+        addAnnotation( getCopyrighted_Copyright(), source,
                 new String[] { "kind", "element", "name", "Copyright", "namespace", "##targetNamespace" } );
-        addAnnotation( tCopyrightNoticeEClass, source,
+        addAnnotation( copyrightNoticeEClass, source,
                 new String[] { "name", "tCopyrightNotice", "kind", "elementOnly" } );
-        addAnnotation( getTCopyrightNotice_Notice(), source,
+        addAnnotation( getCopyrightNotice_Notice(), source,
                 new String[] { "kind", "element", "name", "Notice", "namespace", "##targetNamespace" } );
-        addAnnotation( getTCopyrightNotice_License(), source,
+        addAnnotation( getCopyrightNotice_License(), source,
                 new String[] { "kind", "element", "name", "License", "namespace", "##targetNamespace" } );
-        addAnnotation( tDataAttributeEClass, source, new String[] { "name", "tDataAttribute", "kind", "empty" } );
-        addAnnotation( getTDataAttribute_Dchg(), source, new String[] { "kind", "attribute", "name", "dchg" } );
-        addAnnotation( getTDataAttribute_DefaultValue(), source,
+        addAnnotation( dataAttributeEClass, source, new String[] { "name", "tDataAttribute", "kind", "empty" } );
+        addAnnotation( getDataAttribute_Dchg(), source, new String[] { "kind", "attribute", "name", "dchg" } );
+        addAnnotation( getDataAttribute_DefaultValue(), source,
                 new String[] { "kind", "attribute", "name", "defaultValue" } );
-        addAnnotation( getTDataAttribute_Dupd(), source, new String[] { "kind", "attribute", "name", "dupd" } );
-        addAnnotation( getTDataAttribute_Fc(), source, new String[] { "kind", "attribute", "name", "fc" } );
-        addAnnotation( getTDataAttribute_IsArray(), source, new String[] { "kind", "attribute", "name", "isArray" } );
-        addAnnotation( getTDataAttribute_MaxIndexAttribute(), source,
+        addAnnotation( getDataAttribute_Dupd(), source, new String[] { "kind", "attribute", "name", "dupd" } );
+        addAnnotation( getDataAttribute_Fc(), source, new String[] { "kind", "attribute", "name", "fc" } );
+        addAnnotation( getDataAttribute_IsArray(), source, new String[] { "kind", "attribute", "name", "isArray" } );
+        addAnnotation( getDataAttribute_MaxIndexAttribute(), source,
                 new String[] { "kind", "attribute", "name", "maxIndexAttribute" } );
-        addAnnotation( getTDataAttribute_MaxValue(), source, new String[] { "kind", "attribute", "name", "maxValue" } );
-        addAnnotation( getTDataAttribute_MinIndex(), source, new String[] { "kind", "attribute", "name", "minIndex" } );
-        addAnnotation( getTDataAttribute_MinValue(), source, new String[] { "kind", "attribute", "name", "minValue" } );
-        addAnnotation( getTDataAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( getTDataAttribute_PresCond(), source, new String[] { "kind", "attribute", "name", "presCond" } );
-        addAnnotation( getTDataAttribute_PresCondArgs(), source,
+        addAnnotation( getDataAttribute_MaxValue(), source, new String[] { "kind", "attribute", "name", "maxValue" } );
+        addAnnotation( getDataAttribute_MinIndex(), source, new String[] { "kind", "attribute", "name", "minIndex" } );
+        addAnnotation( getDataAttribute_MinValue(), source, new String[] { "kind", "attribute", "name", "minValue" } );
+        addAnnotation( getDataAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( getDataAttribute_PresCond(), source, new String[] { "kind", "attribute", "name", "presCond" } );
+        addAnnotation( getDataAttribute_PresCondArgs(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgs" } );
-        addAnnotation( getTDataAttribute_PresCondArgsID(), source,
+        addAnnotation( getDataAttribute_PresCondArgsID(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgsID" } );
-        addAnnotation( getTDataAttribute_Qchg(), source, new String[] { "kind", "attribute", "name", "qchg" } );
-        addAnnotation( getTDataAttribute_SizeAttribute(), source,
+        addAnnotation( getDataAttribute_Qchg(), source, new String[] { "kind", "attribute", "name", "qchg" } );
+        addAnnotation( getDataAttribute_SizeAttribute(), source,
                 new String[] { "kind", "attribute", "name", "sizeAttribute" } );
-        addAnnotation( getTDataAttribute_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
-        addAnnotation( getTDataAttribute_TypeKind(), source, new String[] { "kind", "attribute", "name", "typeKind" } );
-        addAnnotation( tDataObjectEClass, source, new String[] { "name", "tDataObject", "kind", "empty" } );
-        addAnnotation( getTDataObject_DsPresCond(), source,
-                new String[] { "kind", "attribute", "name", "dsPresCond" } );
-        addAnnotation( getTDataObject_DsPresCondArgs(), source,
+        addAnnotation( getDataAttribute_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
+        addAnnotation( getDataAttribute_TypeKind(), source, new String[] { "kind", "attribute", "name", "typeKind" } );
+        addAnnotation( dataObjectEClass, source, new String[] { "name", "tDataObject", "kind", "empty" } );
+        addAnnotation( getDataObject_DsPresCond(), source, new String[] { "kind", "attribute", "name", "dsPresCond" } );
+        addAnnotation( getDataObject_DsPresCondArgs(), source,
                 new String[] { "kind", "attribute", "name", "dsPresCondArgs" } );
-        addAnnotation( getTDataObject_DsPresCondArgsID(), source,
+        addAnnotation( getDataObject_DsPresCondArgsID(), source,
                 new String[] { "kind", "attribute", "name", "dsPresCondArgsID" } );
-        addAnnotation( getTDataObject_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( getTDataObject_PresCond(), source, new String[] { "kind", "attribute", "name", "presCond" } );
-        addAnnotation( getTDataObject_PresCondArgs(), source,
+        addAnnotation( getDataObject_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( getDataObject_PresCond(), source, new String[] { "kind", "attribute", "name", "presCond" } );
+        addAnnotation( getDataObject_PresCondArgs(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgs" } );
-        addAnnotation( getTDataObject_PresCondArgsID(), source,
+        addAnnotation( getDataObject_PresCondArgsID(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgsID" } );
-        addAnnotation( getTDataObject_Transient(), source, new String[] { "kind", "attribute", "name", "transient" } );
-        addAnnotation( getTDataObject_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
-        addAnnotation( getTDataObject_UnderlyingType(), source,
+        addAnnotation( getDataObject_Transient(), source, new String[] { "kind", "attribute", "name", "transient" } );
+        addAnnotation( getDataObject_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
+        addAnnotation( getDataObject_UnderlyingType(), source,
                 new String[] { "kind", "attribute", "name", "underlyingType" } );
-        addAnnotation( getTDataObject_UnderlyingTypeKind(), source,
+        addAnnotation( getDataObject_UnderlyingTypeKind(), source,
                 new String[] { "kind", "attribute", "name", "underlyingTypeKind" } );
-        addAnnotation( tDataObjectNameEDataType, source,
-                new String[] { "name", "tDataObjectName", "baseType", "tIec61850Name", "maxLength", "12" } );
-        addAnnotation( tDataSetMemberOfEClass, source, new String[] { "name", "tDataSetMemberOf", "kind", "empty" } );
-        addAnnotation( getTDataSetMemberOf_Cb(), source, new String[] { "kind", "attribute", "name", "cb" } );
-        addAnnotation( tDefinedAttributeTypeKindEEnum, source, new String[] { "name", "tDefinedAttributeTypeKind" } );
-        addAnnotation( tDefinedAttributeTypeKindObjectEDataType, source,
+        addAnnotation( dataSetMemberOfEClass, source, new String[] { "name", "tDataSetMemberOf", "kind", "empty" } );
+        addAnnotation( getDataSetMemberOf_Cb(), source, new String[] { "kind", "attribute", "name", "cb" } );
+        addAnnotation( definedAttributeTypeKindEEnum, source, new String[] { "name", "tDefinedAttributeTypeKind" } );
+        addAnnotation( definedAttributeTypeKindObjectEDataType, source,
                 new String[] { "name", "tDefinedAttributeTypeKind:Object", "baseType", "tDefinedAttributeTypeKind" } );
-        addAnnotation( tDocEClass, source, new String[] { "name", "tDoc", "kind", "mixed" } );
-        addAnnotation( getTDoc_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } );
-        addAnnotation( getTDoc_Group(), source, new String[] { "kind", "group", "name", "group:1" } );
-        addAnnotation( getTDoc_Any(), source, new String[] { "kind", "elementWildcard", "wildcards", "##any", "name",
+        addAnnotation( docEClass, source, new String[] { "name", "tDoc", "kind", "mixed" } );
+        addAnnotation( getDoc_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } );
+        addAnnotation( getDoc_Group(), source, new String[] { "kind", "group", "name", "group:1" } );
+        addAnnotation( getDoc_Any(), source, new String[] { "kind", "elementWildcard", "wildcards", "##any", "name",
                 ":2", "processing", "lax", "group", "#group:1" } );
-        addAnnotation( getTDoc_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
-        addAnnotation( tDocIDEDataType, source, new String[] { "name", "tDocID", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#normalizedString", "minLength", "1" } );
-        addAnnotation( tDocumentedClassEClass, source, new String[] { "name", "tDocumentedClass", "kind", "empty" } );
-        addAnnotation( getTDocumentedClass_Deprecated(), source,
+        addAnnotation( getDoc_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
+        addAnnotation( documentedClassEClass, source, new String[] { "name", "tDocumentedClass", "kind", "empty" } );
+        addAnnotation( getDocumentedClass_Deprecated(), source,
                 new String[] { "kind", "attribute", "name", "deprecated" } );
-        addAnnotation( getTDocumentedClass_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
-        addAnnotation( getTDocumentedClass_Informative(), source,
+        addAnnotation( getDocumentedClass_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
+        addAnnotation( getDocumentedClass_Informative(), source,
                 new String[] { "kind", "attribute", "name", "informative" } );
-        addAnnotation( tEmptyStringEDataType, source, new String[] { "name", "tEmptyString", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#normalizedString", "maxLength", "0" } );
-        addAnnotation( tEnumerationEClass, source, new String[] { "name", "tEnumeration", "kind", "elementOnly" } );
-        addAnnotation( getTEnumeration_Literal(), source,
+        addAnnotation( enumerationEClass, source, new String[] { "name", "tEnumeration", "kind", "elementOnly" } );
+        addAnnotation( getEnumeration_Literal(), source,
                 new String[] { "kind", "element", "name", "Literal", "namespace", "##targetNamespace" } );
-        addAnnotation( getTEnumeration_InheritedFrom(), source,
+        addAnnotation( getEnumeration_InheritedFrom(), source,
                 new String[] { "kind", "attribute", "name", "inheritedFrom" } );
-        addAnnotation( getTEnumeration_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( tEnumerationsEClass, source, new String[] { "name", "tEnumerations", "kind", "elementOnly" } );
-        addAnnotation( getTEnumerations_Enumeration(), source,
+        addAnnotation( getEnumeration_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( enumerationsEClass, source, new String[] { "name", "tEnumerations", "kind", "elementOnly" } );
+        addAnnotation( getEnumerations_Enumeration(), source,
                 new String[] { "kind", "element", "name", "Enumeration", "namespace", "##targetNamespace" } );
-        addAnnotation( tfcAbbreviationEDataType, source,
-                new String[] { "name", "tFCAbbreviation", "baseType", "http://www.eclipse.org/emf/2003/XMLType#token",
-                        "minLength", "1", "pattern", "[\\p{IsBasicLatin}]+" } );
-        addAnnotation( tFunctionalConstraintEClass, source,
+        addAnnotation( functionalConstraintEClass, source,
                 new String[] { "name", "tFunctionalConstraint", "kind", "elementOnly" } );
-        addAnnotation( getTFunctionalConstraint_ApplicableServices(), source,
+        addAnnotation( getFunctionalConstraint_ApplicableServices(), source,
                 new String[] { "kind", "element", "name", "ApplicableServices", "namespace", "##targetNamespace" } );
-        addAnnotation( getTFunctionalConstraint_Abbreviation(), source,
+        addAnnotation( getFunctionalConstraint_Abbreviation(), source,
                 new String[] { "kind", "attribute", "name", "abbreviation" } );
-        addAnnotation( getTFunctionalConstraint_DescID(), source,
+        addAnnotation( getFunctionalConstraint_DescID(), source,
                 new String[] { "kind", "attribute", "name", "descID" } );
-        addAnnotation( getTFunctionalConstraint_TitleID(), source,
+        addAnnotation( getFunctionalConstraint_TitleID(), source,
                 new String[] { "kind", "attribute", "name", "titleID" } );
-        addAnnotation( tFunctionalConstraintsEClass, source,
+        addAnnotation( functionalConstraintsEClass, source,
                 new String[] { "name", "tFunctionalConstraints", "kind", "elementOnly" } );
-        addAnnotation( getTFunctionalConstraints_FunctionalConstraint(), source,
+        addAnnotation( getFunctionalConstraints_FunctionalConstraint(), source,
                 new String[] { "kind", "element", "name", "FunctionalConstraint", "namespace", "##targetNamespace" } );
-        addAnnotation( tIec61850NameEDataType, source,
-                new String[] { "name", "tIec61850Name", "baseType", "http://www.eclipse.org/emf/2003/XMLType#Name",
-                        "minLength", "1", "pattern", "[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]+" } );
-        addAnnotation( tIec61850NameStringEDataType, source,
-                new String[] { "name", "tIec61850NameString", "baseType",
-                        "http://www.eclipse.org/emf/2003/XMLType#normalizedString", "pattern",
-                        "[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]+" } );
-        addAnnotation( tissuesTypeEDataType, source, new String[] { "name", "tissues_._type", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#normalizedString", "minLength", "1" } );
-        addAnnotation( tLicenseEClass, source, new String[] { "name", "tLicense", "kind", "mixed" } );
-        addAnnotation( getTLicense_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } );
-        addAnnotation( getTLicense_Kind(), source, new String[] { "kind", "attribute", "name", "kind" } );
-        addAnnotation( getTLicense_Uri(), source, new String[] { "kind", "attribute", "name", "uri" } );
-        addAnnotation( tLicenseKindEEnum, source, new String[] { "name", "tLicenseKind" } );
-        addAnnotation( tLicenseKindObjectEDataType, source,
+        addAnnotation( licenseEClass, source, new String[] { "name", "tLicense", "kind", "mixed" } );
+        addAnnotation( getLicense_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } );
+        addAnnotation( getLicense_Kind(), source, new String[] { "kind", "attribute", "name", "kind" } );
+        addAnnotation( getLicense_Uri(), source, new String[] { "kind", "attribute", "name", "uri" } );
+        addAnnotation( licenseKindEEnum, source, new String[] { "name", "tLicenseKind" } );
+        addAnnotation( licenseKindObjectEDataType, source,
                 new String[] { "name", "tLicenseKind:Object", "baseType", "tLicenseKind" } );
-        addAnnotation( tLiteralEClass, source, new String[] { "name", "tLiteral", "kind", "empty" } );
-        addAnnotation( getTLiteral_LiteralVal(), source, new String[] { "kind", "attribute", "name", "literalVal" } );
-        addAnnotation( getTLiteral_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( tLiteralNameEDataType, source,
-                new String[] { "name", "tLiteralName", "baseType",
-                        "http://www.eclipse.org/emf/2003/XMLType#normalizedString", "maxLength", "127", "pattern",
-                        "[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]*" } );
-        addAnnotation( tlnClassEClass, source, new String[] { "name", "tLNClass", "kind", "elementOnly" } );
-        addAnnotation( getTLNClass_CanHaveLOG(), source, new String[] { "kind", "attribute", "name", "canHaveLOG" } );
-        addAnnotation( getTLNClass_IsExtension(), source, new String[] { "kind", "attribute", "name", "isExtension" } );
-        addAnnotation( getTLNClass_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( tlnClassesEClass, source, new String[] { "name", "tLNClasses", "kind", "elementOnly" } );
-        addAnnotation( getTLNClasses_AbstractLNClass(), source,
+        addAnnotation( literalEClass, source, new String[] { "name", "tLiteral", "kind", "empty" } );
+        addAnnotation( getLiteral_LiteralVal(), source, new String[] { "kind", "attribute", "name", "literalVal" } );
+        addAnnotation( getLiteral_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( lnClassEClass, source, new String[] { "name", "tLNClass", "kind", "elementOnly" } );
+        addAnnotation( getLNClass_CanHaveLOG(), source, new String[] { "kind", "attribute", "name", "canHaveLOG" } );
+        addAnnotation( getLNClass_IsExtension(), source, new String[] { "kind", "attribute", "name", "isExtension" } );
+        addAnnotation( getLNClass_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( lnClassesEClass, source, new String[] { "name", "tLNClasses", "kind", "elementOnly" } );
+        addAnnotation( getLNClasses_AbstractLNClass(), source,
                 new String[] { "kind", "element", "name", "AbstractLNClass", "namespace", "##targetNamespace" } );
-        addAnnotation( getTLNClasses_LNClass(), source,
+        addAnnotation( getLNClasses_LNClass(), source,
                 new String[] { "kind", "element", "name", "LNClass", "namespace", "##targetNamespace" } );
-        addAnnotation( tlnClassNameEDataType, source, new String[] { "name", "tLNClassName", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#Name", "pattern", "LLN0 [A-Z]{4}" } );
-        addAnnotation( tNoticeEClass, source, new String[] { "name", "tNotice", "kind", "mixed" } );
-        addAnnotation( getTNotice_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } );
-        addAnnotation( tnsEClass, source, new String[] { "name", "tNS", "kind", "elementOnly" } );
-        addAnnotation( getTNS_Changes(), source,
+        addAnnotation( noticeEClass, source, new String[] { "name", "tNotice", "kind", "mixed" } );
+        addAnnotation( getNotice_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } );
+        addAnnotation( nsEClass, source, new String[] { "name", "tNS", "kind", "elementOnly" } );
+        addAnnotation( getNS_Changes(), source,
                 new String[] { "kind", "element", "name", "Changes", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_DependsOn(), source,
+        addAnnotation( getNS_DependsOn(), source,
                 new String[] { "kind", "element", "name", "DependsOn", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_BasicTypes(), source,
+        addAnnotation( getNS_BasicTypes(), source,
                 new String[] { "kind", "element", "name", "BasicTypes", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_FunctionalConstraints(), source,
+        addAnnotation( getNS_FunctionalConstraints(), source,
                 new String[] { "kind", "element", "name", "FunctionalConstraints", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_PresenceConditions(), source,
+        addAnnotation( getNS_PresenceConditions(), source,
                 new String[] { "kind", "element", "name", "PresenceConditions", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_Abbreviations(), source,
+        addAnnotation( getNS_Abbreviations(), source,
                 new String[] { "kind", "element", "name", "Abbreviations", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_Enumerations(), source,
+        addAnnotation( getNS_Enumerations(), source,
                 new String[] { "kind", "element", "name", "Enumerations", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_ConstructedAttributes(), source,
+        addAnnotation( getNS_ConstructedAttributes(), source,
                 new String[] { "kind", "element", "name", "ConstructedAttributes", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_CDCs(), source,
+        addAnnotation( getNS_CDCs(), source,
                 new String[] { "kind", "element", "name", "CDCs", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_LNClasses(), source,
+        addAnnotation( getNS_LNClasses(), source,
                 new String[] { "kind", "element", "name", "LNClasses", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNS_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
-        addAnnotation( getTNS_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
-        addAnnotation( getTNS_PublicationStage(), source,
+        addAnnotation( getNS_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
+        addAnnotation( getNS_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
+        addAnnotation( getNS_PublicationStage(), source,
                 new String[] { "kind", "attribute", "name", "publicationStage" } );
-        addAnnotation( getTNS_Release(), source, new String[] { "kind", "attribute", "name", "release" } );
-        addAnnotation( getTNS_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
-        addAnnotation( getTNS_UmlDate(), source, new String[] { "kind", "attribute", "name", "umlDate" } );
-        addAnnotation( getTNS_UmlVersion(), source, new String[] { "kind", "attribute", "name", "umlVersion" } );
-        addAnnotation( getTNS_Version(), source, new String[] { "kind", "attribute", "name", "version" } );
-        addAnnotation( tnsDocEClass, source, new String[] { "name", "tNSDoc", "kind", "elementOnly" } );
-        addAnnotation( getTNSDoc_Doc(), source,
+        addAnnotation( getNS_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
+        addAnnotation( getNS_UmlDate(), source, new String[] { "kind", "attribute", "name", "umlDate" } );
+        addAnnotation( getNS_UmlVersion(), source, new String[] { "kind", "attribute", "name", "umlVersion" } );
+        addAnnotation( nsDocEClass, source, new String[] { "name", "tNSDoc", "kind", "elementOnly" } );
+        addAnnotation( getNSDoc_Doc(), source,
                 new String[] { "kind", "element", "name", "Doc", "namespace", "##targetNamespace" } );
-        addAnnotation( getTNSDoc_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
-        addAnnotation( getTNSDoc_Lang(), source, new String[] { "kind", "attribute", "name", "lang" } );
-        addAnnotation( getTNSDoc_PublicationStage(), source,
+        addAnnotation( getNSDoc_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
+        addAnnotation( getNSDoc_Lang(), source, new String[] { "kind", "attribute", "name", "lang" } );
+        addAnnotation( getNSDoc_PublicationStage(), source,
                 new String[] { "kind", "attribute", "name", "publicationStage" } );
-        addAnnotation( getTNSDoc_Release(), source, new String[] { "kind", "attribute", "name", "release" } );
-        addAnnotation( getTNSDoc_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
-        addAnnotation( getTNSDoc_UmlDate(), source, new String[] { "kind", "attribute", "name", "umlDate" } );
-        addAnnotation( getTNSDoc_UmlVersion(), source, new String[] { "kind", "attribute", "name", "umlVersion" } );
-        addAnnotation( getTNSDoc_Version(), source, new String[] { "kind", "attribute", "name", "version" } );
-        addAnnotation( tnsIdentifierEDataType, source, new String[] { "name", "tNSIdentifier", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#normalizedString", "pattern", "\\p{IsBasicLatin}+" } );
-        addAnnotation( tnsReleaseEDataType, source, new String[] { "name", "tNSRelease", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#unsignedByte", "minExclusive", "0" } );
-        addAnnotation( tnsReleaseObjectEDataType, source,
-                new String[] { "name", "tNSRelease:Object", "baseType", "tNSRelease" } );
-        addAnnotation( tnsRevisionEDataType, source, new String[] { "name", "tNSRevision", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#token", "pattern", "[A-Z]" } );
-        addAnnotation( tnsVersionEDataType, source,
-                new String[] { "name", "tNSVersion", "baseType",
-                        "http://www.eclipse.org/emf/2003/XMLType#unsignedShort", "minInclusive", "2002", "maxInclusive",
-                        "2099" } );
-        addAnnotation( tnsVersionObjectEDataType, source,
-                new String[] { "name", "tNSVersion:Object", "baseType", "tNSVersion" } );
-        addAnnotation( tPresenceConditionEClass, source,
+        addAnnotation( getNSDoc_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
+        addAnnotation( getNSDoc_UmlDate(), source, new String[] { "kind", "attribute", "name", "umlDate" } );
+        addAnnotation( getNSDoc_UmlVersion(), source, new String[] { "kind", "attribute", "name", "umlVersion" } );
+        addAnnotation( presenceConditionEClass, source,
                 new String[] { "name", "tPresenceCondition", "kind", "empty" } );
-        addAnnotation( getTPresenceCondition_Argument(), source,
+        addAnnotation( getPresenceCondition_Argument(), source,
                 new String[] { "kind", "attribute", "name", "argument" } );
-        addAnnotation( getTPresenceCondition_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
-        addAnnotation( getTPresenceCondition_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( getTPresenceCondition_TitleID(), source,
+        addAnnotation( getPresenceCondition_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
+        addAnnotation( getPresenceCondition_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( getPresenceCondition_TitleID(), source,
                 new String[] { "kind", "attribute", "name", "titleID" } );
-        addAnnotation( tPresenceConditionArgumentEDataType, source, new String[] { "name", "tPresenceConditionArgument",
-                "baseType", "http://www.eclipse.org/emf/2003/XMLType#normalizedString" } );
-        addAnnotation( tPresenceConditionNameEDataType, source, new String[] { "name", "tPresenceConditionName",
-                "baseType", "http://www.eclipse.org/emf/2003/XMLType#normalizedString" } );
-        addAnnotation( tPresenceConditionsEClass, source,
+        addAnnotation( presenceConditionsEClass, source,
                 new String[] { "name", "tPresenceConditions", "kind", "elementOnly" } );
-        addAnnotation( getTPresenceConditions_PresenceCondition(), source,
+        addAnnotation( getPresenceConditions_PresenceCondition(), source,
                 new String[] { "kind", "element", "name", "PresenceCondition", "namespace", "##targetNamespace" } );
-        addAnnotation( tPubStageEEnum, source, new String[] { "name", "tPubStage" } );
-        addAnnotation( tPubStageObjectEDataType, source,
+        addAnnotation( pubStageEEnum, source, new String[] { "name", "tPubStage" } );
+        addAnnotation( pubStageObjectEDataType, source,
                 new String[] { "name", "tPubStage:Object", "baseType", "tPubStage" } );
-        addAnnotation( tServiceCDCEClass, source, new String[] { "name", "tServiceCDC", "kind", "elementOnly" } );
-        addAnnotation( getTServiceCDC_ServiceDataAttribute(), source,
+        addAnnotation( serviceCDCEClass, source, new String[] { "name", "tServiceCDC", "kind", "elementOnly" } );
+        addAnnotation( getServiceCDC_ServiceDataAttribute(), source,
                 new String[] { "kind", "element", "name", "ServiceDataAttribute", "namespace", "##targetNamespace" } );
-        addAnnotation( getTServiceCDC_Cdc(), source, new String[] { "kind", "attribute", "name", "cdc" } );
-        addAnnotation( getTServiceCDC_Variant(), source, new String[] { "kind", "attribute", "name", "variant" } );
-        addAnnotation( tServiceCDCsEClass, source, new String[] { "name", "tServiceCDCs", "kind", "elementOnly" } );
-        addAnnotation( getTServiceCDCs_ServiceCDC(), source,
+        addAnnotation( getServiceCDC_Cdc(), source, new String[] { "kind", "attribute", "name", "cdc" } );
+        addAnnotation( getServiceCDC_Variant(), source, new String[] { "kind", "attribute", "name", "variant" } );
+        addAnnotation( serviceCDCsEClass, source, new String[] { "name", "tServiceCDCs", "kind", "elementOnly" } );
+        addAnnotation( getServiceCDCs_ServiceCDC(), source,
                 new String[] { "kind", "element", "name", "ServiceCDC", "namespace", "##targetNamespace" } );
-        addAnnotation( tServiceConstructedAttributeEClass, source,
+        addAnnotation( serviceConstructedAttributeEClass, source,
                 new String[] { "name", "tServiceConstructedAttribute", "kind", "elementOnly" } );
-        addAnnotation( getTServiceConstructedAttribute_TypeKindParameterized(), source,
+        addAnnotation( getServiceConstructedAttribute_TypeKindParameterized(), source,
                 new String[] { "kind", "attribute", "name", "typeKindParameterized" } );
-        addAnnotation( tServiceConstructedAttributesEClass, source,
+        addAnnotation( serviceConstructedAttributesEClass, source,
                 new String[] { "name", "tServiceConstructedAttributes", "kind", "elementOnly" } );
-        addAnnotation( getTServiceConstructedAttributes_ServiceConstructedAttribute(), source, new String[] { "kind",
+        addAnnotation( getServiceConstructedAttributes_ServiceConstructedAttribute(), source, new String[] { "kind",
                 "element", "name", "ServiceConstructedAttribute", "namespace", "##targetNamespace" } );
-        addAnnotation( tServiceDataAttributeEClass, source,
+        addAnnotation( serviceDataAttributeEClass, source,
                 new String[] { "name", "tServiceDataAttribute", "kind", "empty" } );
-        addAnnotation( getTServiceDataAttribute_Fc(), source, new String[] { "kind", "attribute", "name", "fc" } );
-        addAnnotation( getTServiceDataAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( getTServiceDataAttribute_PresCond(), source,
+        addAnnotation( getServiceDataAttribute_Fc(), source, new String[] { "kind", "attribute", "name", "fc" } );
+        addAnnotation( getServiceDataAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( getServiceDataAttribute_PresCond(), source,
                 new String[] { "kind", "attribute", "name", "presCond" } );
-        addAnnotation( getTServiceDataAttribute_PresCondArgs(), source,
+        addAnnotation( getServiceDataAttribute_PresCondArgs(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgs" } );
-        addAnnotation( getTServiceDataAttribute_PresCondArgsID(), source,
+        addAnnotation( getServiceDataAttribute_PresCondArgsID(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgsID" } );
-        addAnnotation( getTServiceDataAttribute_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
-        addAnnotation( getTServiceDataAttribute_TypeKind(), source,
+        addAnnotation( getServiceDataAttribute_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
+        addAnnotation( getServiceDataAttribute_TypeKind(), source,
                 new String[] { "kind", "attribute", "name", "typeKind" } );
-        addAnnotation( getTServiceDataAttribute_UnderlyingType(), source,
+        addAnnotation( getServiceDataAttribute_UnderlyingType(), source,
                 new String[] { "kind", "attribute", "name", "underlyingType" } );
-        addAnnotation( getTServiceDataAttribute_UnderlyingTypeKind(), source,
+        addAnnotation( getServiceDataAttribute_UnderlyingTypeKind(), source,
                 new String[] { "kind", "attribute", "name", "underlyingTypeKind" } );
-        addAnnotation( tServiceNSEClass, source, new String[] { "name", "tServiceNS", "kind", "elementOnly" } );
-        addAnnotation( getTServiceNS_Changes(), source,
+        addAnnotation( serviceNSEClass, source, new String[] { "name", "tServiceNS", "kind", "elementOnly" } );
+        addAnnotation( getServiceNS_Changes(), source,
                 new String[] { "kind", "element", "name", "Changes", "namespace", "##targetNamespace" } );
-        addAnnotation( getTServiceNS_FunctionalConstraints(), source,
+        addAnnotation( getServiceNS_FunctionalConstraints(), source,
                 new String[] { "kind", "element", "name", "FunctionalConstraints", "namespace", "##targetNamespace" } );
-        addAnnotation( getTServiceNS_PresenceConditions(), source,
+        addAnnotation( getServiceNS_PresenceConditions(), source,
                 new String[] { "kind", "element", "name", "PresenceConditions", "namespace", "##targetNamespace" } );
-        addAnnotation( getTServiceNS_Abbreviations(), source,
+        addAnnotation( getServiceNS_Abbreviations(), source,
                 new String[] { "kind", "element", "name", "Abbreviations", "namespace", "##targetNamespace" } );
-        addAnnotation( getTServiceNS_ServiceTypeRealizations(), source, new String[] { "kind", "element", "name",
+        addAnnotation( getServiceNS_ServiceTypeRealizations(), source, new String[] { "kind", "element", "name",
                 "ServiceTypeRealizations", "namespace", "##targetNamespace" } );
-        addAnnotation( getTServiceNS_ServiceConstructedAttributes(), source, new String[] { "kind", "element", "name",
+        addAnnotation( getServiceNS_ServiceConstructedAttributes(), source, new String[] { "kind", "element", "name",
                 "ServiceConstructedAttributes", "namespace", "##targetNamespace" } );
-        addAnnotation( getTServiceNS_ServiceCDCs(), source,
+        addAnnotation( getServiceNS_ServiceCDCs(), source,
                 new String[] { "kind", "element", "name", "ServiceCDCs", "namespace", "##targetNamespace" } );
-        addAnnotation( getTServiceNS_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
-        addAnnotation( getTServiceNS_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
-        addAnnotation( getTServiceNS_PublicationStage(), source,
+        addAnnotation( getServiceNS_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } );
+        addAnnotation( getServiceNS_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
+        addAnnotation( getServiceNS_PublicationStage(), source,
                 new String[] { "kind", "attribute", "name", "publicationStage" } );
-        addAnnotation( getTServiceNS_Release(), source, new String[] { "kind", "attribute", "name", "release" } );
-        addAnnotation( getTServiceNS_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
-        addAnnotation( getTServiceNS_UmlDate(), source, new String[] { "kind", "attribute", "name", "umlDate" } );
-        addAnnotation( getTServiceNS_UmlVersion(), source, new String[] { "kind", "attribute", "name", "umlVersion" } );
-        addAnnotation( getTServiceNS_Version(), source, new String[] { "kind", "attribute", "name", "version" } );
-        addAnnotation( tServiceNsUsageEClass, source,
+        addAnnotation( getServiceNS_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
+        addAnnotation( getServiceNS_UmlDate(), source, new String[] { "kind", "attribute", "name", "umlDate" } );
+        addAnnotation( getServiceNS_UmlVersion(), source, new String[] { "kind", "attribute", "name", "umlVersion" } );
+        addAnnotation( serviceNsUsageEClass, source,
                 new String[] { "name", "tServiceNsUsage", "kind", "elementOnly" } );
-        addAnnotation( getTServiceNsUsage_AppliesTo(), source,
+        addAnnotation( getServiceNsUsage_AppliesTo(), source,
                 new String[] { "kind", "element", "name", "AppliesTo", "namespace", "##targetNamespace" } );
-        addAnnotation( getTServiceNsUsage_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
-        addAnnotation( getTServiceNsUsage_PublicationStage(), source,
+        addAnnotation( getServiceNsUsage_Id(), source, new String[] { "kind", "attribute", "name", "id" } );
+        addAnnotation( getServiceNsUsage_PublicationStage(), source,
                 new String[] { "kind", "attribute", "name", "publicationStage" } );
-        addAnnotation( getTServiceNsUsage_Release(), source, new String[] { "kind", "attribute", "name", "release" } );
-        addAnnotation( getTServiceNsUsage_Revision(), source,
-                new String[] { "kind", "attribute", "name", "revision" } );
-        addAnnotation( getTServiceNsUsage_Version(), source, new String[] { "kind", "attribute", "name", "version" } );
-        addAnnotation( tServiceParameterEClass, source, new String[] { "name", "tServiceParameter", "kind", "empty" } );
-        addAnnotation( getTServiceParameter_DefaultValue(), source,
+        addAnnotation( getServiceNsUsage_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } );
+        addAnnotation( serviceParameterEClass, source, new String[] { "name", "tServiceParameter", "kind", "empty" } );
+        addAnnotation( getServiceParameter_DefaultValue(), source,
                 new String[] { "kind", "attribute", "name", "defaultValue" } );
-        addAnnotation( getTServiceParameter_MaxValue(), source,
+        addAnnotation( getServiceParameter_MaxValue(), source,
                 new String[] { "kind", "attribute", "name", "maxValue" } );
-        addAnnotation( getTServiceParameter_MinValue(), source,
+        addAnnotation( getServiceParameter_MinValue(), source,
                 new String[] { "kind", "attribute", "name", "minValue" } );
-        addAnnotation( getTServiceParameter_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( getTServiceParameter_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
-        addAnnotation( getTServiceParameter_TypeKind(), source,
+        addAnnotation( getServiceParameter_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( getServiceParameter_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
+        addAnnotation( getServiceParameter_TypeKind(), source,
                 new String[] { "kind", "attribute", "name", "typeKind" } );
-        addAnnotation( tServiceTypeRealizationEClass, source,
+        addAnnotation( serviceTypeRealizationEClass, source,
                 new String[] { "name", "tServiceTypeRealization", "kind", "empty" } );
-        addAnnotation( getTServiceTypeRealization_Fc(), source, new String[] { "kind", "attribute", "name", "fc" } );
-        addAnnotation( getTServiceTypeRealization_Name(), source,
-                new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( getTServiceTypeRealization_PresCond(), source,
+        addAnnotation( getServiceTypeRealization_Fc(), source, new String[] { "kind", "attribute", "name", "fc" } );
+        addAnnotation( getServiceTypeRealization_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( getServiceTypeRealization_PresCond(), source,
                 new String[] { "kind", "attribute", "name", "presCond" } );
-        addAnnotation( getTServiceTypeRealization_PresCondArgs(), source,
+        addAnnotation( getServiceTypeRealization_PresCondArgs(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgs" } );
-        addAnnotation( getTServiceTypeRealization_PresCondArgsID(), source,
+        addAnnotation( getServiceTypeRealization_PresCondArgsID(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgsID" } );
-        addAnnotation( getTServiceTypeRealization_Type(), source,
-                new String[] { "kind", "attribute", "name", "type" } );
-        addAnnotation( getTServiceTypeRealization_TypeKind(), source,
+        addAnnotation( getServiceTypeRealization_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
+        addAnnotation( getServiceTypeRealization_TypeKind(), source,
                 new String[] { "kind", "attribute", "name", "typeKind" } );
-        addAnnotation( tServiceTypeRealizationsEClass, source,
+        addAnnotation( serviceTypeRealizationsEClass, source,
                 new String[] { "name", "tServiceTypeRealizations", "kind", "elementOnly" } );
-        addAnnotation( getTServiceTypeRealizations_ServiceTypeRealization(), source, new String[] { "kind", "element",
+        addAnnotation( getServiceTypeRealizations_ServiceTypeRealization(), source, new String[] { "kind", "element",
                 "name", "ServiceTypeRealization", "namespace", "##targetNamespace" } );
-        addAnnotation( tSubDataAttributeEClass, source, new String[] { "name", "tSubDataAttribute", "kind", "empty" } );
-        addAnnotation( getTSubDataAttribute_DefaultValue(), source,
+        addAnnotation( subDataAttributeEClass, source, new String[] { "name", "tSubDataAttribute", "kind", "empty" } );
+        addAnnotation( getSubDataAttribute_DefaultValue(), source,
                 new String[] { "kind", "attribute", "name", "defaultValue" } );
-        addAnnotation( getTSubDataAttribute_IsArray(), source,
-                new String[] { "kind", "attribute", "name", "isArray" } );
-        addAnnotation( getTSubDataAttribute_MaxIndexAttribute(), source,
+        addAnnotation( getSubDataAttribute_IsArray(), source, new String[] { "kind", "attribute", "name", "isArray" } );
+        addAnnotation( getSubDataAttribute_MaxIndexAttribute(), source,
                 new String[] { "kind", "attribute", "name", "maxIndexAttribute" } );
-        addAnnotation( getTSubDataAttribute_MaxValue(), source,
+        addAnnotation( getSubDataAttribute_MaxValue(), source,
                 new String[] { "kind", "attribute", "name", "maxValue" } );
-        addAnnotation( getTSubDataAttribute_MinIndex(), source,
+        addAnnotation( getSubDataAttribute_MinIndex(), source,
                 new String[] { "kind", "attribute", "name", "minIndex" } );
-        addAnnotation( getTSubDataAttribute_MinValue(), source,
+        addAnnotation( getSubDataAttribute_MinValue(), source,
                 new String[] { "kind", "attribute", "name", "minValue" } );
-        addAnnotation( getTSubDataAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( getTSubDataAttribute_PresCond(), source,
+        addAnnotation( getSubDataAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( getSubDataAttribute_PresCond(), source,
                 new String[] { "kind", "attribute", "name", "presCond" } );
-        addAnnotation( getTSubDataAttribute_PresCondArgs(), source,
+        addAnnotation( getSubDataAttribute_PresCondArgs(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgs" } );
-        addAnnotation( getTSubDataAttribute_PresCondArgsID(), source,
+        addAnnotation( getSubDataAttribute_PresCondArgsID(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgsID" } );
-        addAnnotation( getTSubDataAttribute_SizeAttribute(), source,
+        addAnnotation( getSubDataAttribute_SizeAttribute(), source,
                 new String[] { "kind", "attribute", "name", "sizeAttribute" } );
-        addAnnotation( getTSubDataAttribute_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
-        addAnnotation( getTSubDataAttribute_TypeKind(), source,
+        addAnnotation( getSubDataAttribute_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
+        addAnnotation( getSubDataAttribute_TypeKind(), source,
                 new String[] { "kind", "attribute", "name", "typeKind" } );
-        addAnnotation( tSubDataObjectEClass, source, new String[] { "name", "tSubDataObject", "kind", "empty" } );
-        addAnnotation( getTSubDataObject_IsArray(), source, new String[] { "kind", "attribute", "name", "isArray" } );
-        addAnnotation( getTSubDataObject_MaxIndexAttribute(), source,
+        addAnnotation( subDataObjectEClass, source, new String[] { "name", "tSubDataObject", "kind", "empty" } );
+        addAnnotation( getSubDataObject_IsArray(), source, new String[] { "kind", "attribute", "name", "isArray" } );
+        addAnnotation( getSubDataObject_MaxIndexAttribute(), source,
                 new String[] { "kind", "attribute", "name", "maxIndexAttribute" } );
-        addAnnotation( getTSubDataObject_MinIndex(), source, new String[] { "kind", "attribute", "name", "minIndex" } );
-        addAnnotation( getTSubDataObject_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
-        addAnnotation( getTSubDataObject_PresCond(), source, new String[] { "kind", "attribute", "name", "presCond" } );
-        addAnnotation( getTSubDataObject_PresCondArgs(), source,
+        addAnnotation( getSubDataObject_MinIndex(), source, new String[] { "kind", "attribute", "name", "minIndex" } );
+        addAnnotation( getSubDataObject_Name(), source, new String[] { "kind", "attribute", "name", "name" } );
+        addAnnotation( getSubDataObject_PresCond(), source, new String[] { "kind", "attribute", "name", "presCond" } );
+        addAnnotation( getSubDataObject_PresCondArgs(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgs" } );
-        addAnnotation( getTSubDataObject_PresCondArgsID(), source,
+        addAnnotation( getSubDataObject_PresCondArgsID(), source,
                 new String[] { "kind", "attribute", "name", "presCondArgsID" } );
-        addAnnotation( getTSubDataObject_SizeAttribute(), source,
+        addAnnotation( getSubDataObject_SizeAttribute(), source,
                 new String[] { "kind", "attribute", "name", "sizeAttribute" } );
-        addAnnotation( getTSubDataObject_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
-        addAnnotation( getTSubDataObject_UnderlyingType(), source,
+        addAnnotation( getSubDataObject_Type(), source, new String[] { "kind", "attribute", "name", "type" } );
+        addAnnotation( getSubDataObject_UnderlyingType(), source,
                 new String[] { "kind", "attribute", "name", "underlyingType" } );
-        addAnnotation( getTSubDataObject_UnderlyingTypeKind(), source,
+        addAnnotation( getSubDataObject_UnderlyingTypeKind(), source,
                 new String[] { "kind", "attribute", "name", "underlyingTypeKind" } );
-        addAnnotation( tSubDataObjectNameEDataType, source,
-                new String[] { "name", "tSubDataObjectName", "baseType", "tIec61850Name" } );
-        addAnnotation( tTitledClassEClass, source, new String[] { "name", "tTitledClass", "kind", "empty" } );
-        addAnnotation( getTTitledClass_TitleID(), source, new String[] { "kind", "attribute", "name", "titleID" } );
-        addAnnotation( tumlVersionEDataType, source, new String[] { "name", "tUMLVersion", "baseType",
-                "http://www.eclipse.org/emf/2003/XMLType#Name", "minLength", "1" } );
-        addAnnotation( tUndefinedAttributeTypeKindEEnum, source,
+        addAnnotation( titledClassEClass, source, new String[] { "name", "tTitledClass", "kind", "empty" } );
+        addAnnotation( getTitledClass_TitleID(), source, new String[] { "kind", "attribute", "name", "titleID" } );
+        addAnnotation( undefinedAttributeTypeKindEEnum, source,
                 new String[] { "name", "tUndefinedAttributeTypeKind" } );
-        addAnnotation( tUndefinedAttributeTypeKindObjectEDataType, source, new String[] { "name",
+        addAnnotation( undefinedAttributeTypeKindObjectEDataType, source, new String[] { "name",
                 "tUndefinedAttributeTypeKind:Object", "baseType", "tUndefinedAttributeTypeKind" } );
+        addAnnotation( getNSDObjectWithVersionAndRelease_Release(), source,
+                new String[] { "kind", "attribute", "name", "release" } );
+        addAnnotation( getNSDObjectWithVersionAndRelease_Version(), source,
+                new String[] { "kind", "attribute", "name", "version" } );
     }
 
 } //NsdPackageImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TPresenceConditionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java
similarity index 82%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TPresenceConditionImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java
index 59e263b10c24b8880809aaaf5baa44023e1b36e9..9cdf3fa63ff51079b8d82a76dea43e807b421847 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TPresenceConditionImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -31,21 +31,21 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TPresence Condition</b></em>'.
+ * An implementation of the model object '<em><b>Presence Condition</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionImpl#getArgument <em>Argument</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionImpl#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionImpl#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionImpl#getTitleID <em>Title ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionImpl#getArgument <em>Argument</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionImpl#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionImpl#getTitleID <em>Title ID</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TPresenceConditionImpl extends MinimalEObjectImpl.Container implements TPresenceCondition {
+public class PresenceConditionImpl extends MinimalEObjectImpl.Container implements PresenceCondition {
     /**
      * The default value of the '{@link #getArgument() <em>Argument</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -131,7 +131,7 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TPresenceConditionImpl() {
+    protected PresenceConditionImpl() {
         super();
     }
 
@@ -142,7 +142,7 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TPRESENCE_CONDITION;
+        return NsdPackage.Literals.PRESENCE_CONDITION;
     }
 
     /**
@@ -165,7 +165,7 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
         String oldArgument = argument;
         argument = newArgument;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TPRESENCE_CONDITION__ARGUMENT, oldArgument, argument ) );
+                NsdPackage.PRESENCE_CONDITION__ARGUMENT, oldArgument, argument ) );
     }
 
     /**
@@ -188,7 +188,7 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
         String oldDescID = descID;
         descID = newDescID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TPRESENCE_CONDITION__DESC_ID, oldDescID, descID ) );
+                NsdPackage.PRESENCE_CONDITION__DESC_ID, oldDescID, descID ) );
     }
 
     /**
@@ -211,7 +211,7 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
         String oldName = name;
         name = newName;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TPRESENCE_CONDITION__NAME, oldName, name ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.PRESENCE_CONDITION__NAME, oldName, name ) );
     }
 
     /**
@@ -234,7 +234,7 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
         String oldTitleID = titleID;
         titleID = newTitleID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TPRESENCE_CONDITION__TITLE_ID, oldTitleID, titleID ) );
+                NsdPackage.PRESENCE_CONDITION__TITLE_ID, oldTitleID, titleID ) );
     }
 
     /**
@@ -245,13 +245,13 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TPRESENCE_CONDITION__ARGUMENT:
+        case NsdPackage.PRESENCE_CONDITION__ARGUMENT:
             return getArgument();
-        case NsdPackage.TPRESENCE_CONDITION__DESC_ID:
+        case NsdPackage.PRESENCE_CONDITION__DESC_ID:
             return getDescID();
-        case NsdPackage.TPRESENCE_CONDITION__NAME:
+        case NsdPackage.PRESENCE_CONDITION__NAME:
             return getName();
-        case NsdPackage.TPRESENCE_CONDITION__TITLE_ID:
+        case NsdPackage.PRESENCE_CONDITION__TITLE_ID:
             return getTitleID();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -265,16 +265,16 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TPRESENCE_CONDITION__ARGUMENT:
+        case NsdPackage.PRESENCE_CONDITION__ARGUMENT:
             setArgument( ( String ) newValue );
             return;
-        case NsdPackage.TPRESENCE_CONDITION__DESC_ID:
+        case NsdPackage.PRESENCE_CONDITION__DESC_ID:
             setDescID( ( String ) newValue );
             return;
-        case NsdPackage.TPRESENCE_CONDITION__NAME:
+        case NsdPackage.PRESENCE_CONDITION__NAME:
             setName( ( String ) newValue );
             return;
-        case NsdPackage.TPRESENCE_CONDITION__TITLE_ID:
+        case NsdPackage.PRESENCE_CONDITION__TITLE_ID:
             setTitleID( ( String ) newValue );
             return;
         }
@@ -289,16 +289,16 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TPRESENCE_CONDITION__ARGUMENT:
+        case NsdPackage.PRESENCE_CONDITION__ARGUMENT:
             setArgument( ARGUMENT_EDEFAULT );
             return;
-        case NsdPackage.TPRESENCE_CONDITION__DESC_ID:
+        case NsdPackage.PRESENCE_CONDITION__DESC_ID:
             setDescID( DESC_ID_EDEFAULT );
             return;
-        case NsdPackage.TPRESENCE_CONDITION__NAME:
+        case NsdPackage.PRESENCE_CONDITION__NAME:
             setName( NAME_EDEFAULT );
             return;
-        case NsdPackage.TPRESENCE_CONDITION__TITLE_ID:
+        case NsdPackage.PRESENCE_CONDITION__TITLE_ID:
             setTitleID( TITLE_ID_EDEFAULT );
             return;
         }
@@ -313,13 +313,13 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TPRESENCE_CONDITION__ARGUMENT:
+        case NsdPackage.PRESENCE_CONDITION__ARGUMENT:
             return ARGUMENT_EDEFAULT == null ? argument != null : !ARGUMENT_EDEFAULT.equals( argument );
-        case NsdPackage.TPRESENCE_CONDITION__DESC_ID:
+        case NsdPackage.PRESENCE_CONDITION__DESC_ID:
             return DESC_ID_EDEFAULT == null ? descID != null : !DESC_ID_EDEFAULT.equals( descID );
-        case NsdPackage.TPRESENCE_CONDITION__NAME:
+        case NsdPackage.PRESENCE_CONDITION__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
-        case NsdPackage.TPRESENCE_CONDITION__TITLE_ID:
+        case NsdPackage.PRESENCE_CONDITION__TITLE_ID:
             return TITLE_ID_EDEFAULT == null ? titleID != null : !TITLE_ID_EDEFAULT.equals( titleID );
         }
         return super.eIsSet( featureID );
@@ -347,4 +347,4 @@ public class TPresenceConditionImpl extends MinimalEObjectImpl.Container impleme
         return result.toString();
     }
 
-} //TPresenceConditionImpl
+} //PresenceConditionImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TPresenceConditionsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionsImpl.java
similarity index 75%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TPresenceConditionsImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionsImpl.java
index 44e6718dc697f4ca4e4e89ef23b889c3f01f4125..46a5a9aed4c5658eb442277253126fa5c5fa538f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TPresenceConditionsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionsImpl.java
@@ -20,8 +20,8 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions;
 
 import java.util.Collection;
 
@@ -39,18 +39,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TPresence Conditions</b></em>'.
+ * An implementation of the model object '<em><b>Presence Conditions</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TPresenceConditionsImpl#getPresenceCondition <em>Presence Condition</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.PresenceConditionsImpl#getPresenceCondition <em>Presence Condition</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TPresenceConditionsImpl extends MinimalEObjectImpl.Container implements TPresenceConditions {
+public class PresenceConditionsImpl extends MinimalEObjectImpl.Container implements PresenceConditions {
     /**
      * The cached value of the '{@link #getPresenceCondition() <em>Presence Condition</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -59,14 +59,14 @@ public class TPresenceConditionsImpl extends MinimalEObjectImpl.Container implem
      * @generated
      * @ordered
      */
-    protected EList< TPresenceCondition > presenceCondition;
+    protected EList< PresenceCondition > presenceCondition;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TPresenceConditionsImpl() {
+    protected PresenceConditionsImpl() {
         super();
     }
 
@@ -77,7 +77,7 @@ public class TPresenceConditionsImpl extends MinimalEObjectImpl.Container implem
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TPRESENCE_CONDITIONS;
+        return NsdPackage.Literals.PRESENCE_CONDITIONS;
     }
 
     /**
@@ -86,10 +86,10 @@ public class TPresenceConditionsImpl extends MinimalEObjectImpl.Container implem
      * @generated
      */
     @Override
-    public EList< TPresenceCondition > getPresenceCondition() {
+    public EList< PresenceCondition > getPresenceCondition() {
         if( presenceCondition == null ) {
-            presenceCondition = new EObjectContainmentEList< TPresenceCondition >( TPresenceCondition.class, this,
-                    NsdPackage.TPRESENCE_CONDITIONS__PRESENCE_CONDITION );
+            presenceCondition = new EObjectContainmentEList< PresenceCondition >( PresenceCondition.class, this,
+                    NsdPackage.PRESENCE_CONDITIONS__PRESENCE_CONDITION );
         }
         return presenceCondition;
     }
@@ -102,7 +102,7 @@ public class TPresenceConditionsImpl extends MinimalEObjectImpl.Container implem
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TPRESENCE_CONDITIONS__PRESENCE_CONDITION:
+        case NsdPackage.PRESENCE_CONDITIONS__PRESENCE_CONDITION:
             return ( ( InternalEList< ? > ) getPresenceCondition() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -116,7 +116,7 @@ public class TPresenceConditionsImpl extends MinimalEObjectImpl.Container implem
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TPRESENCE_CONDITIONS__PRESENCE_CONDITION:
+        case NsdPackage.PRESENCE_CONDITIONS__PRESENCE_CONDITION:
             return getPresenceCondition();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -131,9 +131,9 @@ public class TPresenceConditionsImpl extends MinimalEObjectImpl.Container implem
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TPRESENCE_CONDITIONS__PRESENCE_CONDITION:
+        case NsdPackage.PRESENCE_CONDITIONS__PRESENCE_CONDITION:
             getPresenceCondition().clear();
-            getPresenceCondition().addAll( ( Collection< ? extends TPresenceCondition > ) newValue );
+            getPresenceCondition().addAll( ( Collection< ? extends PresenceCondition > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -147,7 +147,7 @@ public class TPresenceConditionsImpl extends MinimalEObjectImpl.Container implem
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TPRESENCE_CONDITIONS__PRESENCE_CONDITION:
+        case NsdPackage.PRESENCE_CONDITIONS__PRESENCE_CONDITION:
             getPresenceCondition().clear();
             return;
         }
@@ -162,10 +162,10 @@ public class TPresenceConditionsImpl extends MinimalEObjectImpl.Container implem
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TPRESENCE_CONDITIONS__PRESENCE_CONDITION:
+        case NsdPackage.PRESENCE_CONDITIONS__PRESENCE_CONDITION:
             return presenceCondition != null && !presenceCondition.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TPresenceConditionsImpl
+} //PresenceConditionsImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceCDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCImpl.java
similarity index 79%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceCDCImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCImpl.java
index 9efad16279cc3cd099838a4cb9102113d0b6d151..e7d488cdd7a0a2198f1f537a76402b1b8fae54d0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceCDCImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCImpl.java
@@ -20,8 +20,8 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute;
 
 import java.util.Collection;
 
@@ -41,20 +41,20 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService CDC</b></em>'.
+ * An implementation of the model object '<em><b>Service CDC</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCImpl#getServiceDataAttribute <em>Service Data Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCImpl#getCdc <em>Cdc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCImpl#getVariant <em>Variant</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCImpl#getServiceDataAttribute <em>Service Data Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCImpl#getCdc <em>Cdc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCImpl#getVariant <em>Variant</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TServiceCDC {
+public class ServiceCDCImpl extends MinimalEObjectImpl.Container implements ServiceCDC {
     /**
      * The cached value of the '{@link #getServiceDataAttribute() <em>Service Data Attribute</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -63,7 +63,7 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
      * @generated
      * @ordered
      */
-    protected EList< TServiceDataAttribute > serviceDataAttribute;
+    protected EList< ServiceDataAttribute > serviceDataAttribute;
 
     /**
      * The default value of the '{@link #getCdc() <em>Cdc</em>}' attribute.
@@ -110,7 +110,7 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceCDCImpl() {
+    protected ServiceCDCImpl() {
         super();
     }
 
@@ -121,7 +121,7 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_CDC;
+        return NsdPackage.Literals.SERVICE_CDC;
     }
 
     /**
@@ -130,10 +130,10 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
      * @generated
      */
     @Override
-    public EList< TServiceDataAttribute > getServiceDataAttribute() {
+    public EList< ServiceDataAttribute > getServiceDataAttribute() {
         if( serviceDataAttribute == null ) {
-            serviceDataAttribute = new EObjectContainmentEList< TServiceDataAttribute >( TServiceDataAttribute.class,
-                    this, NsdPackage.TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE );
+            serviceDataAttribute = new EObjectContainmentEList< ServiceDataAttribute >( ServiceDataAttribute.class,
+                    this, NsdPackage.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE );
         }
         return serviceDataAttribute;
     }
@@ -158,7 +158,7 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
         String oldCdc = cdc;
         cdc = newCdc;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_CDC__CDC, oldCdc, cdc ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_CDC__CDC, oldCdc, cdc ) );
     }
 
     /**
@@ -180,8 +180,8 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
     public void setVariant( String newVariant ) {
         String oldVariant = variant;
         variant = newVariant;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_CDC__VARIANT, oldVariant, variant ) );
+        if( eNotificationRequired() ) eNotify(
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_CDC__VARIANT, oldVariant, variant ) );
     }
 
     /**
@@ -192,7 +192,7 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
+        case NsdPackage.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
             return ( ( InternalEList< ? > ) getServiceDataAttribute() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -206,11 +206,11 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
+        case NsdPackage.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
             return getServiceDataAttribute();
-        case NsdPackage.TSERVICE_CDC__CDC:
+        case NsdPackage.SERVICE_CDC__CDC:
             return getCdc();
-        case NsdPackage.TSERVICE_CDC__VARIANT:
+        case NsdPackage.SERVICE_CDC__VARIANT:
             return getVariant();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -225,14 +225,14 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
+        case NsdPackage.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
             getServiceDataAttribute().clear();
-            getServiceDataAttribute().addAll( ( Collection< ? extends TServiceDataAttribute > ) newValue );
+            getServiceDataAttribute().addAll( ( Collection< ? extends ServiceDataAttribute > ) newValue );
             return;
-        case NsdPackage.TSERVICE_CDC__CDC:
+        case NsdPackage.SERVICE_CDC__CDC:
             setCdc( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_CDC__VARIANT:
+        case NsdPackage.SERVICE_CDC__VARIANT:
             setVariant( ( String ) newValue );
             return;
         }
@@ -247,13 +247,13 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
+        case NsdPackage.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
             getServiceDataAttribute().clear();
             return;
-        case NsdPackage.TSERVICE_CDC__CDC:
+        case NsdPackage.SERVICE_CDC__CDC:
             setCdc( CDC_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_CDC__VARIANT:
+        case NsdPackage.SERVICE_CDC__VARIANT:
             setVariant( VARIANT_EDEFAULT );
             return;
         }
@@ -268,11 +268,11 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
+        case NsdPackage.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE:
             return serviceDataAttribute != null && !serviceDataAttribute.isEmpty();
-        case NsdPackage.TSERVICE_CDC__CDC:
+        case NsdPackage.SERVICE_CDC__CDC:
             return CDC_EDEFAULT == null ? cdc != null : !CDC_EDEFAULT.equals( cdc );
-        case NsdPackage.TSERVICE_CDC__VARIANT:
+        case NsdPackage.SERVICE_CDC__VARIANT:
             return VARIANT_EDEFAULT == null ? variant != null : !VARIANT_EDEFAULT.equals( variant );
         }
         return super.eIsSet( featureID );
@@ -296,4 +296,4 @@ public class TServiceCDCImpl extends MinimalEObjectImpl.Container implements TSe
         return result.toString();
     }
 
-} //TServiceCDCImpl
+} //ServiceCDCImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceCDCsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCsImpl.java
similarity index 77%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceCDCsImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCsImpl.java
index ebb31d10ccad68f221ad80e22cab939b3ca3b969..b885f5ea0179ff5481311327ff0e9d8379468175 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceCDCsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCsImpl.java
@@ -20,8 +20,8 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs;
 
 import java.util.Collection;
 
@@ -39,18 +39,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService CD Cs</b></em>'.
+ * An implementation of the model object '<em><b>Service CD Cs</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceCDCsImpl#getServiceCDC <em>Service CDC</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceCDCsImpl#getServiceCDC <em>Service CDC</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceCDCsImpl extends MinimalEObjectImpl.Container implements TServiceCDCs {
+public class ServiceCDCsImpl extends MinimalEObjectImpl.Container implements ServiceCDCs {
     /**
      * The cached value of the '{@link #getServiceCDC() <em>Service CDC</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -59,14 +59,14 @@ public class TServiceCDCsImpl extends MinimalEObjectImpl.Container implements TS
      * @generated
      * @ordered
      */
-    protected EList< TServiceCDC > serviceCDC;
+    protected EList< ServiceCDC > serviceCDC;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceCDCsImpl() {
+    protected ServiceCDCsImpl() {
         super();
     }
 
@@ -77,7 +77,7 @@ public class TServiceCDCsImpl extends MinimalEObjectImpl.Container implements TS
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_CD_CS;
+        return NsdPackage.Literals.SERVICE_CD_CS;
     }
 
     /**
@@ -86,10 +86,10 @@ public class TServiceCDCsImpl extends MinimalEObjectImpl.Container implements TS
      * @generated
      */
     @Override
-    public EList< TServiceCDC > getServiceCDC() {
+    public EList< ServiceCDC > getServiceCDC() {
         if( serviceCDC == null ) {
-            serviceCDC = new EObjectContainmentEList< TServiceCDC >( TServiceCDC.class, this,
-                    NsdPackage.TSERVICE_CD_CS__SERVICE_CDC );
+            serviceCDC = new EObjectContainmentEList< ServiceCDC >( ServiceCDC.class, this,
+                    NsdPackage.SERVICE_CD_CS__SERVICE_CDC );
         }
         return serviceCDC;
     }
@@ -102,7 +102,7 @@ public class TServiceCDCsImpl extends MinimalEObjectImpl.Container implements TS
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CD_CS__SERVICE_CDC:
+        case NsdPackage.SERVICE_CD_CS__SERVICE_CDC:
             return ( ( InternalEList< ? > ) getServiceCDC() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -116,7 +116,7 @@ public class TServiceCDCsImpl extends MinimalEObjectImpl.Container implements TS
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CD_CS__SERVICE_CDC:
+        case NsdPackage.SERVICE_CD_CS__SERVICE_CDC:
             return getServiceCDC();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -131,9 +131,9 @@ public class TServiceCDCsImpl extends MinimalEObjectImpl.Container implements TS
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CD_CS__SERVICE_CDC:
+        case NsdPackage.SERVICE_CD_CS__SERVICE_CDC:
             getServiceCDC().clear();
-            getServiceCDC().addAll( ( Collection< ? extends TServiceCDC > ) newValue );
+            getServiceCDC().addAll( ( Collection< ? extends ServiceCDC > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -147,7 +147,7 @@ public class TServiceCDCsImpl extends MinimalEObjectImpl.Container implements TS
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CD_CS__SERVICE_CDC:
+        case NsdPackage.SERVICE_CD_CS__SERVICE_CDC:
             getServiceCDC().clear();
             return;
         }
@@ -162,10 +162,10 @@ public class TServiceCDCsImpl extends MinimalEObjectImpl.Container implements TS
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CD_CS__SERVICE_CDC:
+        case NsdPackage.SERVICE_CD_CS__SERVICE_CDC:
             return serviceCDC != null && !serviceCDC.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TServiceCDCsImpl
+} //ServiceCDCsImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceConstructedAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributeImpl.java
similarity index 83%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceConstructedAttributeImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributeImpl.java
index af16e9b33ba69d2027dc1eb06ed976972804ac98..ea0e3565096b7fdb3ba0f6d19449e5bdacea2f88 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceConstructedAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributeImpl.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -30,19 +30,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService Constructed Attribute</b></em>'.
+ * An implementation of the model object '<em><b>Service Constructed Attribute</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributeImpl#isTypeKindParameterized <em>Type Kind Parameterized</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributeImpl#isTypeKindParameterized <em>Type Kind Parameterized</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
-        implements TServiceConstructedAttribute {
+public class ServiceConstructedAttributeImpl extends ConstructedAttributeImpl implements ServiceConstructedAttribute {
     /**
      * The default value of the '{@link #isTypeKindParameterized() <em>Type Kind Parameterized</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -77,7 +76,7 @@ public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceConstructedAttributeImpl() {
+    protected ServiceConstructedAttributeImpl() {
         super();
     }
 
@@ -88,7 +87,7 @@ public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_CONSTRUCTED_ATTRIBUTE;
+        return NsdPackage.Literals.SERVICE_CONSTRUCTED_ATTRIBUTE;
     }
 
     /**
@@ -113,7 +112,7 @@ public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
         boolean oldTypeKindParameterizedESet = typeKindParameterizedESet;
         typeKindParameterizedESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, oldTypeKindParameterized,
+                NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, oldTypeKindParameterized,
                 typeKindParameterized, !oldTypeKindParameterizedESet ) );
     }
 
@@ -129,7 +128,7 @@ public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
         typeKindParameterized = TYPE_KIND_PARAMETERIZED_EDEFAULT;
         typeKindParameterizedESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, oldTypeKindParameterized,
+                NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, oldTypeKindParameterized,
                 TYPE_KIND_PARAMETERIZED_EDEFAULT, oldTypeKindParameterizedESet ) );
     }
 
@@ -151,7 +150,7 @@ public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
             return isTypeKindParameterized();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -165,7 +164,7 @@ public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
             setTypeKindParameterized( ( Boolean ) newValue );
             return;
         }
@@ -180,7 +179,7 @@ public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
             unsetTypeKindParameterized();
             return;
         }
@@ -195,7 +194,7 @@ public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED:
             return isSetTypeKindParameterized();
         }
         return super.eIsSet( featureID );
@@ -220,4 +219,4 @@ public class TServiceConstructedAttributeImpl extends TConstructedAttributeImpl
         return result.toString();
     }
 
-} //TServiceConstructedAttributeImpl
+} //ServiceConstructedAttributeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceConstructedAttributesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributesImpl.java
similarity index 71%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceConstructedAttributesImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributesImpl.java
index 38e53d2af49547a16a423dedb085efe6f629e927..74cce0203dc6b89dccc5bcb2b25f6b2b5ee128d3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceConstructedAttributesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributesImpl.java
@@ -20,8 +20,8 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes;
 
 import java.util.Collection;
 
@@ -39,19 +39,19 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService Constructed Attributes</b></em>'.
+ * An implementation of the model object '<em><b>Service Constructed Attributes</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceConstructedAttributesImpl#getServiceConstructedAttribute <em>Service Constructed Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceConstructedAttributesImpl#getServiceConstructedAttribute <em>Service Constructed Attribute</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceConstructedAttributesImpl extends MinimalEObjectImpl.Container
-        implements TServiceConstructedAttributes {
+public class ServiceConstructedAttributesImpl extends MinimalEObjectImpl.Container
+        implements ServiceConstructedAttributes {
     /**
      * The cached value of the '{@link #getServiceConstructedAttribute() <em>Service Constructed Attribute</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -60,14 +60,14 @@ public class TServiceConstructedAttributesImpl extends MinimalEObjectImpl.Contai
      * @generated
      * @ordered
      */
-    protected EList< TServiceConstructedAttribute > serviceConstructedAttribute;
+    protected EList< ServiceConstructedAttribute > serviceConstructedAttribute;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceConstructedAttributesImpl() {
+    protected ServiceConstructedAttributesImpl() {
         super();
     }
 
@@ -78,7 +78,7 @@ public class TServiceConstructedAttributesImpl extends MinimalEObjectImpl.Contai
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_CONSTRUCTED_ATTRIBUTES;
+        return NsdPackage.Literals.SERVICE_CONSTRUCTED_ATTRIBUTES;
     }
 
     /**
@@ -87,11 +87,11 @@ public class TServiceConstructedAttributesImpl extends MinimalEObjectImpl.Contai
      * @generated
      */
     @Override
-    public EList< TServiceConstructedAttribute > getServiceConstructedAttribute() {
+    public EList< ServiceConstructedAttribute > getServiceConstructedAttribute() {
         if( serviceConstructedAttribute == null ) {
-            serviceConstructedAttribute = new EObjectContainmentEList< TServiceConstructedAttribute >(
-                    TServiceConstructedAttribute.class, this,
-                    NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE );
+            serviceConstructedAttribute = new EObjectContainmentEList< ServiceConstructedAttribute >(
+                    ServiceConstructedAttribute.class, this,
+                    NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE );
         }
         return serviceConstructedAttribute;
     }
@@ -104,7 +104,7 @@ public class TServiceConstructedAttributesImpl extends MinimalEObjectImpl.Contai
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
             return ( ( InternalEList< ? > ) getServiceConstructedAttribute() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -118,7 +118,7 @@ public class TServiceConstructedAttributesImpl extends MinimalEObjectImpl.Contai
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
             return getServiceConstructedAttribute();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -133,10 +133,9 @@ public class TServiceConstructedAttributesImpl extends MinimalEObjectImpl.Contai
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
             getServiceConstructedAttribute().clear();
-            getServiceConstructedAttribute()
-                    .addAll( ( Collection< ? extends TServiceConstructedAttribute > ) newValue );
+            getServiceConstructedAttribute().addAll( ( Collection< ? extends ServiceConstructedAttribute > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -150,7 +149,7 @@ public class TServiceConstructedAttributesImpl extends MinimalEObjectImpl.Contai
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
             getServiceConstructedAttribute().clear();
             return;
         }
@@ -165,10 +164,10 @@ public class TServiceConstructedAttributesImpl extends MinimalEObjectImpl.Contai
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE:
             return serviceConstructedAttribute != null && !serviceConstructedAttribute.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TServiceConstructedAttributesImpl
+} //ServiceConstructedAttributesImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceDataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceDataAttributeImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java
index ca2cc0ea4c8ba220c2db282f4e8726e997cdf7dd..f3b63c5ec61d3b4e4395ef1ddc6daed308490445 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceDataAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java
@@ -19,10 +19,10 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -34,26 +34,26 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService Data Attribute</b></em>'.
+ * An implementation of the model object '<em><b>Service Data Attribute</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl#getFc <em>Fc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl#getTypeKind <em>Type Kind</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl#getUnderlyingType <em>Underlying Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceDataAttributeImpl#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl#getFc <em>Fc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl#getUnderlyingType <em>Underlying Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceDataAttributeImpl#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements TServiceDataAttribute {
+public class ServiceDataAttributeImpl extends DocumentedClassImpl implements ServiceDataAttribute {
     /**
      * The default value of the '{@link #getFc() <em>Fc</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -192,7 +192,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
      * @ordered
      */
     protected static final Enumerator TYPE_KIND_EDEFAULT = ( Enumerator ) NsdFactory.eINSTANCE
-            .createFromString( NsdPackage.eINSTANCE.getTAttributeTypeKind(), "BASIC" );
+            .createFromString( NsdPackage.eINSTANCE.getAttributeTypeKind(), "BASIC" );
 
     /**
      * The cached value of the '{@link #getTypeKind() <em>Type Kind</em>}' attribute.
@@ -241,7 +241,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
      * @generated
      * @ordered
      */
-    protected static final TDefinedAttributeTypeKind UNDERLYING_TYPE_KIND_EDEFAULT = TDefinedAttributeTypeKind.BASIC;
+    protected static final DefinedAttributeTypeKind UNDERLYING_TYPE_KIND_EDEFAULT = DefinedAttributeTypeKind.BASIC;
 
     /**
      * The cached value of the '{@link #getUnderlyingTypeKind() <em>Underlying Type Kind</em>}' attribute.
@@ -251,7 +251,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
      * @generated
      * @ordered
      */
-    protected TDefinedAttributeTypeKind underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT;
+    protected DefinedAttributeTypeKind underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT;
 
     /**
      * This is true if the Underlying Type Kind attribute has been set.
@@ -267,7 +267,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceDataAttributeImpl() {
+    protected ServiceDataAttributeImpl() {
         super();
     }
 
@@ -278,7 +278,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_DATA_ATTRIBUTE;
+        return NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE;
     }
 
     /**
@@ -301,7 +301,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         String oldFc = fc;
         fc = newFc;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_DATA_ATTRIBUTE__FC, oldFc, fc ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__FC, oldFc, fc ) );
     }
 
     /**
@@ -324,7 +324,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         String oldName = name;
         name = newName;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__NAME, oldName, name ) );
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME, oldName, name ) );
     }
 
     /**
@@ -349,7 +349,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         boolean oldPresCondESet = presCondESet;
         presCondESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
     }
 
     /**
@@ -364,7 +364,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         presCond = PRES_COND_EDEFAULT;
         presCondESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
     }
 
     /**
@@ -397,7 +397,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         String oldPresCondArgs = presCondArgs;
         presCondArgs = newPresCondArgs;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
     }
 
     /**
@@ -420,7 +420,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         String oldPresCondArgsID = presCondArgsID;
         presCondArgsID = newPresCondArgsID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
     }
 
     /**
@@ -443,7 +443,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         String oldType = type;
         type = newType;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE, oldType, type ) );
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE, oldType, type ) );
     }
 
     /**
@@ -468,7 +468,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         boolean oldTypeKindESet = typeKindESet;
         typeKindESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
     }
 
     /**
@@ -483,7 +483,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         typeKind = TYPE_KIND_EDEFAULT;
         typeKindESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
     }
 
     /**
@@ -516,7 +516,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         String oldUnderlyingType = underlyingType;
         underlyingType = newUnderlyingType;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE, oldUnderlyingType, underlyingType ) );
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE, oldUnderlyingType, underlyingType ) );
     }
 
     /**
@@ -525,7 +525,7 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
      * @generated
      */
     @Override
-    public TDefinedAttributeTypeKind getUnderlyingTypeKind() {
+    public DefinedAttributeTypeKind getUnderlyingTypeKind() {
         return underlyingTypeKind;
     }
 
@@ -535,13 +535,13 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
      * @generated
      */
     @Override
-    public void setUnderlyingTypeKind( TDefinedAttributeTypeKind newUnderlyingTypeKind ) {
-        TDefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
+    public void setUnderlyingTypeKind( DefinedAttributeTypeKind newUnderlyingTypeKind ) {
+        DefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
         underlyingTypeKind = newUnderlyingTypeKind == null ? UNDERLYING_TYPE_KIND_EDEFAULT : newUnderlyingTypeKind;
         boolean oldUnderlyingTypeKindESet = underlyingTypeKindESet;
         underlyingTypeKindESet = true;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND,
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND,
                         oldUnderlyingTypeKind, underlyingTypeKind, !oldUnderlyingTypeKindESet ) );
     }
 
@@ -552,12 +552,12 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
      */
     @Override
     public void unsetUnderlyingTypeKind() {
-        TDefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
+        DefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
         boolean oldUnderlyingTypeKindESet = underlyingTypeKindESet;
         underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT;
         underlyingTypeKindESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND, oldUnderlyingTypeKind,
+                NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND, oldUnderlyingTypeKind,
                 UNDERLYING_TYPE_KIND_EDEFAULT, oldUnderlyingTypeKindESet ) );
     }
 
@@ -579,23 +579,23 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__FC:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__FC:
             return getFc();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME:
             return getName();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND:
             return getPresCond();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
             return getPresCondArgs();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             return getPresCondArgsID();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE:
             return getType();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND:
             return getTypeKind();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
             return getUnderlyingType();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
             return getUnderlyingTypeKind();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -609,32 +609,32 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__FC:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__FC:
             setFc( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME:
             setName( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND:
             setPresCond( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
             setPresCondArgs( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             setPresCondArgsID( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE:
             setType( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND:
             setTypeKind( ( Enumerator ) newValue );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
             setUnderlyingType( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
-            setUnderlyingTypeKind( ( TDefinedAttributeTypeKind ) newValue );
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
+            setUnderlyingTypeKind( ( DefinedAttributeTypeKind ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -648,31 +648,31 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__FC:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__FC:
             setFc( FC_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME:
             setName( NAME_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND:
             unsetPresCond();
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
             setPresCondArgs( PRES_COND_ARGS_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             setPresCondArgsID( PRES_COND_ARGS_ID_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE:
             setType( TYPE_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND:
             unsetTypeKind();
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
             setUnderlyingType( UNDERLYING_TYPE_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
             unsetUnderlyingTypeKind();
             return;
         }
@@ -687,26 +687,26 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__FC:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__FC:
             return FC_EDEFAULT == null ? fc != null : !FC_EDEFAULT.equals( fc );
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND:
             return isSetPresCond();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS:
             return PRES_COND_ARGS_EDEFAULT == null ? presCondArgs != null
                     : !PRES_COND_ARGS_EDEFAULT.equals( presCondArgs );
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             return PRES_COND_ARGS_ID_EDEFAULT == null ? presCondArgsID != null
                     : !PRES_COND_ARGS_ID_EDEFAULT.equals( presCondArgsID );
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE:
             return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals( type );
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND:
             return isSetTypeKind();
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE:
             return UNDERLYING_TYPE_EDEFAULT == null ? underlyingType != null
                     : !UNDERLYING_TYPE_EDEFAULT.equals( underlyingType );
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND:
             return isSetUnderlyingTypeKind();
         }
         return super.eIsSet( featureID );
@@ -753,4 +753,4 @@ public class TServiceDataAttributeImpl extends TDocumentedClassImpl implements T
         return result.toString();
     }
 
-} //TServiceDataAttributeImpl
+} //ServiceDataAttributeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceNSImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java
similarity index 67%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceNSImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java
index 340b75848acc8c840bbdfa22706e1c70becf1ab0..75650fd3b1b96c38b800cd8f59513708d181edc8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceNSImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java
@@ -19,16 +19,17 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
@@ -42,32 +43,90 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService NS</b></em>'.
+ * An implementation of the model object '<em><b>Service NS</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getChanges <em>Changes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getFunctionalConstraints <em>Functional Constraints</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getPresenceConditions <em>Presence Conditions</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getAbbreviations <em>Abbreviations</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getServiceTypeRealizations <em>Service Type Realizations</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getServiceConstructedAttributes <em>Service Constructed Attributes</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getServiceCDCs <em>Service CD Cs</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getDescID <em>Desc ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getId <em>Id</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getUmlDate <em>Uml Date</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getUmlVersion <em>Uml Version</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNSImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getRelease <em>Release</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getChanges <em>Changes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getFunctionalConstraints <em>Functional Constraints</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getPresenceConditions <em>Presence Conditions</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getAbbreviations <em>Abbreviations</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getServiceTypeRealizations <em>Service Type Realizations</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getServiceConstructedAttributes <em>Service Constructed Attributes</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getServiceCDCs <em>Service CD Cs</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getDescID <em>Desc ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getPublicationStage <em>Publication Stage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getRevision <em>Revision</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getUmlDate <em>Uml Date</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNSImpl#getUmlVersion <em>Uml Version</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
+public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS {
+    /**
+     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getRelease()
+     * @generated
+     * @ordered
+     */
+    protected static final Integer RELEASE_EDEFAULT = new Integer( 1 );
+
+    /**
+     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getRelease()
+     * @generated
+     * @ordered
+     */
+    protected Integer release = RELEASE_EDEFAULT;
+
+    /**
+     * This is true if the Release attribute has been set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    protected boolean releaseESet;
+
+    /**
+     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getVersion()
+     * @generated
+     * @ordered
+     */
+    protected static final Integer VERSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getVersion()
+     * @generated
+     * @ordered
+     */
+    protected Integer version = VERSION_EDEFAULT;
+
+    /**
+     * This is true if the Version attribute has been set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    protected boolean versionESet;
+
     /**
      * The cached value of the '{@link #getChanges() <em>Changes</em>}' containment reference.
      * <!-- begin-user-doc -->
@@ -76,7 +135,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      * @ordered
      */
-    protected TChanges changes;
+    protected Changes changes;
 
     /**
      * The cached value of the '{@link #getFunctionalConstraints() <em>Functional Constraints</em>}' containment reference.
@@ -86,7 +145,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      * @ordered
      */
-    protected TFunctionalConstraints functionalConstraints;
+    protected FunctionalConstraints functionalConstraints;
 
     /**
      * The cached value of the '{@link #getPresenceConditions() <em>Presence Conditions</em>}' containment reference.
@@ -96,7 +155,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      * @ordered
      */
-    protected TPresenceConditions presenceConditions;
+    protected PresenceConditions presenceConditions;
 
     /**
      * The cached value of the '{@link #getAbbreviations() <em>Abbreviations</em>}' containment reference.
@@ -106,7 +165,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      * @ordered
      */
-    protected TAbbreviations abbreviations;
+    protected Abbreviations abbreviations;
 
     /**
      * The cached value of the '{@link #getServiceTypeRealizations() <em>Service Type Realizations</em>}' containment reference.
@@ -116,7 +175,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      * @ordered
      */
-    protected TServiceTypeRealizations serviceTypeRealizations;
+    protected ServiceTypeRealizations serviceTypeRealizations;
 
     /**
      * The cached value of the '{@link #getServiceConstructedAttributes() <em>Service Constructed Attributes</em>}' containment reference.
@@ -126,7 +185,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      * @ordered
      */
-    protected TServiceConstructedAttributes serviceConstructedAttributes;
+    protected ServiceConstructedAttributes serviceConstructedAttributes;
 
     /**
      * The cached value of the '{@link #getServiceCDCs() <em>Service CD Cs</em>}' containment reference.
@@ -136,7 +195,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      * @ordered
      */
-    protected TServiceCDCs serviceCDCs;
+    protected ServiceCDCs serviceCDCs;
 
     /**
      * The default value of the '{@link #getDescID() <em>Desc ID</em>}' attribute.
@@ -186,7 +245,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      * @ordered
      */
-    protected static final TPubStage PUBLICATION_STAGE_EDEFAULT = TPubStage.IS;
+    protected static final PubStage PUBLICATION_STAGE_EDEFAULT = PubStage.IS;
 
     /**
      * The cached value of the '{@link #getPublicationStage() <em>Publication Stage</em>}' attribute.
@@ -196,7 +255,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      * @ordered
      */
-    protected TPubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
+    protected PubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
 
     /**
      * This is true if the Publication Stage attribute has been set.
@@ -207,35 +266,6 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      */
     protected boolean publicationStageESet;
 
-    /**
-     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected static final short RELEASE_EDEFAULT = 1;
-
-    /**
-     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected short release = RELEASE_EDEFAULT;
-
-    /**
-     * This is true if the Release attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean releaseESet;
-
     /**
      * The default value of the '{@link #getRevision() <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -305,41 +335,12 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      */
     protected String umlVersion = UML_VERSION_EDEFAULT;
 
-    /**
-     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected static final int VERSION_EDEFAULT = 0;
-
-    /**
-     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected int version = VERSION_EDEFAULT;
-
-    /**
-     * This is true if the Version attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean versionESet;
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceNSImpl() {
+    protected ServiceNSImpl() {
         super();
     }
 
@@ -350,7 +351,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_NS;
+        return NsdPackage.Literals.SERVICE_NS;
     }
 
     /**
@@ -359,7 +360,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public TChanges getChanges() {
+    public Changes getChanges() {
         return changes;
     }
 
@@ -368,12 +369,12 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetChanges( TChanges newChanges, NotificationChain msgs ) {
-        TChanges oldChanges = changes;
+    public NotificationChain basicSetChanges( Changes newChanges, NotificationChain msgs ) {
+        Changes oldChanges = changes;
         changes = newChanges;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TSERVICE_NS__CHANGES, oldChanges, newChanges );
+                    NsdPackage.SERVICE_NS__CHANGES, oldChanges, newChanges );
             if( msgs == null )
                 msgs = notification;
             else
@@ -388,18 +389,18 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setChanges( TChanges newChanges ) {
+    public void setChanges( Changes newChanges ) {
         if( newChanges != changes ) {
             NotificationChain msgs = null;
             if( changes != null ) msgs = ( ( InternalEObject ) changes ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__CHANGES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__CHANGES, null, msgs );
             if( newChanges != null ) msgs = ( ( InternalEObject ) newChanges ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__CHANGES, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__CHANGES, null, msgs );
             msgs = basicSetChanges( newChanges, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__CHANGES, newChanges, newChanges ) );
+                NsdPackage.SERVICE_NS__CHANGES, newChanges, newChanges ) );
     }
 
     /**
@@ -408,7 +409,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public TFunctionalConstraints getFunctionalConstraints() {
+    public FunctionalConstraints getFunctionalConstraints() {
         return functionalConstraints;
     }
 
@@ -417,14 +418,13 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetFunctionalConstraints( TFunctionalConstraints newFunctionalConstraints,
+    public NotificationChain basicSetFunctionalConstraints( FunctionalConstraints newFunctionalConstraints,
             NotificationChain msgs ) {
-        TFunctionalConstraints oldFunctionalConstraints = functionalConstraints;
+        FunctionalConstraints oldFunctionalConstraints = functionalConstraints;
         functionalConstraints = newFunctionalConstraints;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS, oldFunctionalConstraints,
-                    newFunctionalConstraints );
+                    NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, oldFunctionalConstraints, newFunctionalConstraints );
             if( msgs == null )
                 msgs = notification;
             else
@@ -439,20 +439,20 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setFunctionalConstraints( TFunctionalConstraints newFunctionalConstraints ) {
+    public void setFunctionalConstraints( FunctionalConstraints newFunctionalConstraints ) {
         if( newFunctionalConstraints != functionalConstraints ) {
             NotificationChain msgs = null;
             if( functionalConstraints != null )
                 msgs = ( ( InternalEObject ) functionalConstraints ).eInverseRemove( this,
-                        EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS, null, msgs );
+                        EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, null, msgs );
             if( newFunctionalConstraints != null )
                 msgs = ( ( InternalEObject ) newFunctionalConstraints ).eInverseAdd( this,
-                        EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS, null, msgs );
+                        EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, null, msgs );
             msgs = basicSetFunctionalConstraints( newFunctionalConstraints, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS, newFunctionalConstraints, newFunctionalConstraints ) );
+                NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, newFunctionalConstraints, newFunctionalConstraints ) );
     }
 
     /**
@@ -461,7 +461,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public TPresenceConditions getPresenceConditions() {
+    public PresenceConditions getPresenceConditions() {
         return presenceConditions;
     }
 
@@ -470,13 +470,13 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetPresenceConditions( TPresenceConditions newPresenceConditions,
+    public NotificationChain basicSetPresenceConditions( PresenceConditions newPresenceConditions,
             NotificationChain msgs ) {
-        TPresenceConditions oldPresenceConditions = presenceConditions;
+        PresenceConditions oldPresenceConditions = presenceConditions;
         presenceConditions = newPresenceConditions;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS, oldPresenceConditions, newPresenceConditions );
+                    NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, oldPresenceConditions, newPresenceConditions );
             if( msgs == null )
                 msgs = notification;
             else
@@ -491,18 +491,18 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setPresenceConditions( TPresenceConditions newPresenceConditions ) {
+    public void setPresenceConditions( PresenceConditions newPresenceConditions ) {
         if( newPresenceConditions != presenceConditions ) {
             NotificationChain msgs = null;
             if( presenceConditions != null ) msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, null, msgs );
             if( newPresenceConditions != null ) msgs = ( ( InternalEObject ) newPresenceConditions ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, null, msgs );
             msgs = basicSetPresenceConditions( newPresenceConditions, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS, newPresenceConditions, newPresenceConditions ) );
+                NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, newPresenceConditions, newPresenceConditions ) );
     }
 
     /**
@@ -511,7 +511,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public TAbbreviations getAbbreviations() {
+    public Abbreviations getAbbreviations() {
         return abbreviations;
     }
 
@@ -520,12 +520,12 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetAbbreviations( TAbbreviations newAbbreviations, NotificationChain msgs ) {
-        TAbbreviations oldAbbreviations = abbreviations;
+    public NotificationChain basicSetAbbreviations( Abbreviations newAbbreviations, NotificationChain msgs ) {
+        Abbreviations oldAbbreviations = abbreviations;
         abbreviations = newAbbreviations;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TSERVICE_NS__ABBREVIATIONS, oldAbbreviations, newAbbreviations );
+                    NsdPackage.SERVICE_NS__ABBREVIATIONS, oldAbbreviations, newAbbreviations );
             if( msgs == null )
                 msgs = notification;
             else
@@ -540,18 +540,18 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setAbbreviations( TAbbreviations newAbbreviations ) {
+    public void setAbbreviations( Abbreviations newAbbreviations ) {
         if( newAbbreviations != abbreviations ) {
             NotificationChain msgs = null;
             if( abbreviations != null ) msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__ABBREVIATIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__ABBREVIATIONS, null, msgs );
             if( newAbbreviations != null ) msgs = ( ( InternalEObject ) newAbbreviations ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__ABBREVIATIONS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__ABBREVIATIONS, null, msgs );
             msgs = basicSetAbbreviations( newAbbreviations, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__ABBREVIATIONS, newAbbreviations, newAbbreviations ) );
+                NsdPackage.SERVICE_NS__ABBREVIATIONS, newAbbreviations, newAbbreviations ) );
     }
 
     /**
@@ -560,7 +560,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public TServiceTypeRealizations getServiceTypeRealizations() {
+    public ServiceTypeRealizations getServiceTypeRealizations() {
         return serviceTypeRealizations;
     }
 
@@ -569,13 +569,13 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetServiceTypeRealizations( TServiceTypeRealizations newServiceTypeRealizations,
+    public NotificationChain basicSetServiceTypeRealizations( ServiceTypeRealizations newServiceTypeRealizations,
             NotificationChain msgs ) {
-        TServiceTypeRealizations oldServiceTypeRealizations = serviceTypeRealizations;
+        ServiceTypeRealizations oldServiceTypeRealizations = serviceTypeRealizations;
         serviceTypeRealizations = newServiceTypeRealizations;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS, oldServiceTypeRealizations,
+                    NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS, oldServiceTypeRealizations,
                     newServiceTypeRealizations );
             if( msgs == null )
                 msgs = notification;
@@ -591,20 +591,20 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setServiceTypeRealizations( TServiceTypeRealizations newServiceTypeRealizations ) {
+    public void setServiceTypeRealizations( ServiceTypeRealizations newServiceTypeRealizations ) {
         if( newServiceTypeRealizations != serviceTypeRealizations ) {
             NotificationChain msgs = null;
             if( serviceTypeRealizations != null )
                 msgs = ( ( InternalEObject ) serviceTypeRealizations ).eInverseRemove( this,
-                        EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS, null, msgs );
+                        EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS, null, msgs );
             if( newServiceTypeRealizations != null )
                 msgs = ( ( InternalEObject ) newServiceTypeRealizations ).eInverseAdd( this,
-                        EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS, null, msgs );
+                        EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS, null, msgs );
             msgs = basicSetServiceTypeRealizations( newServiceTypeRealizations, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS,
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS,
                     newServiceTypeRealizations, newServiceTypeRealizations ) );
     }
 
@@ -614,7 +614,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public TServiceConstructedAttributes getServiceConstructedAttributes() {
+    public ServiceConstructedAttributes getServiceConstructedAttributes() {
         return serviceConstructedAttributes;
     }
 
@@ -624,12 +624,12 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     public NotificationChain basicSetServiceConstructedAttributes(
-            TServiceConstructedAttributes newServiceConstructedAttributes, NotificationChain msgs ) {
-        TServiceConstructedAttributes oldServiceConstructedAttributes = serviceConstructedAttributes;
+            ServiceConstructedAttributes newServiceConstructedAttributes, NotificationChain msgs ) {
+        ServiceConstructedAttributes oldServiceConstructedAttributes = serviceConstructedAttributes;
         serviceConstructedAttributes = newServiceConstructedAttributes;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, oldServiceConstructedAttributes,
+                    NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, oldServiceConstructedAttributes,
                     newServiceConstructedAttributes );
             if( msgs == null )
                 msgs = notification;
@@ -645,20 +645,20 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setServiceConstructedAttributes( TServiceConstructedAttributes newServiceConstructedAttributes ) {
+    public void setServiceConstructedAttributes( ServiceConstructedAttributes newServiceConstructedAttributes ) {
         if( newServiceConstructedAttributes != serviceConstructedAttributes ) {
             NotificationChain msgs = null;
             if( serviceConstructedAttributes != null )
                 msgs = ( ( InternalEObject ) serviceConstructedAttributes ).eInverseRemove( this,
-                        EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, null, msgs );
+                        EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, null, msgs );
             if( newServiceConstructedAttributes != null )
                 msgs = ( ( InternalEObject ) newServiceConstructedAttributes ).eInverseAdd( this,
-                        EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, null, msgs );
+                        EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, null, msgs );
             msgs = basicSetServiceConstructedAttributes( newServiceConstructedAttributes, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES,
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES,
                         newServiceConstructedAttributes, newServiceConstructedAttributes ) );
     }
 
@@ -668,7 +668,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public TServiceCDCs getServiceCDCs() {
+    public ServiceCDCs getServiceCDCs() {
         return serviceCDCs;
     }
 
@@ -677,12 +677,12 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetServiceCDCs( TServiceCDCs newServiceCDCs, NotificationChain msgs ) {
-        TServiceCDCs oldServiceCDCs = serviceCDCs;
+    public NotificationChain basicSetServiceCDCs( ServiceCDCs newServiceCDCs, NotificationChain msgs ) {
+        ServiceCDCs oldServiceCDCs = serviceCDCs;
         serviceCDCs = newServiceCDCs;
         if( eNotificationRequired() ) {
             ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
-                    NsdPackage.TSERVICE_NS__SERVICE_CD_CS, oldServiceCDCs, newServiceCDCs );
+                    NsdPackage.SERVICE_NS__SERVICE_CD_CS, oldServiceCDCs, newServiceCDCs );
             if( msgs == null )
                 msgs = notification;
             else
@@ -697,18 +697,18 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setServiceCDCs( TServiceCDCs newServiceCDCs ) {
+    public void setServiceCDCs( ServiceCDCs newServiceCDCs ) {
         if( newServiceCDCs != serviceCDCs ) {
             NotificationChain msgs = null;
             if( serviceCDCs != null ) msgs = ( ( InternalEObject ) serviceCDCs ).eInverseRemove( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__SERVICE_CD_CS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__SERVICE_CD_CS, null, msgs );
             if( newServiceCDCs != null ) msgs = ( ( InternalEObject ) newServiceCDCs ).eInverseAdd( this,
-                    EOPPOSITE_FEATURE_BASE - NsdPackage.TSERVICE_NS__SERVICE_CD_CS, null, msgs );
+                    EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__SERVICE_CD_CS, null, msgs );
             msgs = basicSetServiceCDCs( newServiceCDCs, msgs );
             if( msgs != null ) msgs.dispatch();
         }
         else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__SERVICE_CD_CS, newServiceCDCs, newServiceCDCs ) );
+                NsdPackage.SERVICE_NS__SERVICE_CD_CS, newServiceCDCs, newServiceCDCs ) );
     }
 
     /**
@@ -731,7 +731,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
         String oldDescID = descID;
         descID = newDescID;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_NS__DESC_ID, oldDescID, descID ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__DESC_ID, oldDescID, descID ) );
     }
 
     /**
@@ -754,7 +754,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
         String oldId = id;
         id = newId;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_NS__ID, oldId, id ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__ID, oldId, id ) );
     }
 
     /**
@@ -763,7 +763,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public TPubStage getPublicationStage() {
+    public PubStage getPublicationStage() {
         return publicationStage;
     }
 
@@ -773,13 +773,13 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setPublicationStage( TPubStage newPublicationStage ) {
-        TPubStage oldPublicationStage = publicationStage;
+    public void setPublicationStage( PubStage newPublicationStage ) {
+        PubStage oldPublicationStage = publicationStage;
         publicationStage = newPublicationStage == null ? PUBLICATION_STAGE_EDEFAULT : newPublicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStageESet = true;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_NS__PUBLICATION_STAGE,
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__PUBLICATION_STAGE,
                     oldPublicationStage, publicationStage, !oldPublicationStageESet ) );
     }
 
@@ -790,12 +790,12 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      */
     @Override
     public void unsetPublicationStage() {
-        TPubStage oldPublicationStage = publicationStage;
+        PubStage oldPublicationStage = publicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStage = PUBLICATION_STAGE_EDEFAULT;
         publicationStageESet = false;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TSERVICE_NS__PUBLICATION_STAGE,
+            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__PUBLICATION_STAGE,
                     oldPublicationStage, PUBLICATION_STAGE_EDEFAULT, oldPublicationStageESet ) );
     }
 
@@ -815,7 +815,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public short getRelease() {
+    public Integer getRelease() {
         return release;
     }
 
@@ -825,13 +825,13 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setRelease( short newRelease ) {
-        short oldRelease = release;
+    public void setRelease( Integer newRelease ) {
+        Integer oldRelease = release;
         release = newRelease;
         boolean oldReleaseESet = releaseESet;
         releaseESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__RELEASE, oldRelease, release, !oldReleaseESet ) );
+                NsdPackage.SERVICE_NS__RELEASE, oldRelease, release, !oldReleaseESet ) );
     }
 
     /**
@@ -841,12 +841,12 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      */
     @Override
     public void unsetRelease() {
-        short oldRelease = release;
+        Integer oldRelease = release;
         boolean oldReleaseESet = releaseESet;
         release = RELEASE_EDEFAULT;
         releaseESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_NS__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) );
+                NsdPackage.SERVICE_NS__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) );
     }
 
     /**
@@ -881,7 +881,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
         boolean oldRevisionESet = revisionESet;
         revisionESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__REVISION, oldRevision, revision, !oldRevisionESet ) );
+                NsdPackage.SERVICE_NS__REVISION, oldRevision, revision, !oldRevisionESet ) );
     }
 
     /**
@@ -896,7 +896,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
         revision = REVISION_EDEFAULT;
         revisionESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_NS__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
+                NsdPackage.SERVICE_NS__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
     }
 
     /**
@@ -928,8 +928,8 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
     public void setUmlDate( XMLGregorianCalendar newUmlDate ) {
         XMLGregorianCalendar oldUmlDate = umlDate;
         umlDate = newUmlDate;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__UML_DATE, oldUmlDate, umlDate ) );
+        if( eNotificationRequired() ) eNotify(
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__UML_DATE, oldUmlDate, umlDate ) );
     }
 
     /**
@@ -952,7 +952,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
         String oldUmlVersion = umlVersion;
         umlVersion = newUmlVersion;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__UML_VERSION, oldUmlVersion, umlVersion ) );
+                NsdPackage.SERVICE_NS__UML_VERSION, oldUmlVersion, umlVersion ) );
     }
 
     /**
@@ -961,7 +961,7 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public int getVersion() {
+    public Integer getVersion() {
         return version;
     }
 
@@ -971,13 +971,13 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      * @generated
      */
     @Override
-    public void setVersion( int newVersion ) {
-        int oldVersion = version;
+    public void setVersion( Integer newVersion ) {
+        Integer oldVersion = version;
         version = newVersion;
         boolean oldVersionESet = versionESet;
         versionESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS__VERSION, oldVersion, version, !oldVersionESet ) );
+                NsdPackage.SERVICE_NS__VERSION, oldVersion, version, !oldVersionESet ) );
     }
 
     /**
@@ -987,12 +987,12 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
      */
     @Override
     public void unsetVersion() {
-        int oldVersion = version;
+        Integer oldVersion = version;
         boolean oldVersionESet = versionESet;
         version = VERSION_EDEFAULT;
         versionESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_NS__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
+                NsdPackage.SERVICE_NS__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
     }
 
     /**
@@ -1013,19 +1013,19 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS__CHANGES:
+        case NsdPackage.SERVICE_NS__CHANGES:
             return basicSetChanges( null, msgs );
-        case NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS:
+        case NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS:
             return basicSetFunctionalConstraints( null, msgs );
-        case NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS:
+        case NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS:
             return basicSetPresenceConditions( null, msgs );
-        case NsdPackage.TSERVICE_NS__ABBREVIATIONS:
+        case NsdPackage.SERVICE_NS__ABBREVIATIONS:
             return basicSetAbbreviations( null, msgs );
-        case NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS:
+        case NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS:
             return basicSetServiceTypeRealizations( null, msgs );
-        case NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
+        case NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
             return basicSetServiceConstructedAttributes( null, msgs );
-        case NsdPackage.TSERVICE_NS__SERVICE_CD_CS:
+        case NsdPackage.SERVICE_NS__SERVICE_CD_CS:
             return basicSetServiceCDCs( null, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -1039,36 +1039,36 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS__CHANGES:
+        case NsdPackage.SERVICE_NS__RELEASE:
+            return getRelease();
+        case NsdPackage.SERVICE_NS__VERSION:
+            return getVersion();
+        case NsdPackage.SERVICE_NS__CHANGES:
             return getChanges();
-        case NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS:
+        case NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS:
             return getFunctionalConstraints();
-        case NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS:
+        case NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS:
             return getPresenceConditions();
-        case NsdPackage.TSERVICE_NS__ABBREVIATIONS:
+        case NsdPackage.SERVICE_NS__ABBREVIATIONS:
             return getAbbreviations();
-        case NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS:
+        case NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS:
             return getServiceTypeRealizations();
-        case NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
+        case NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
             return getServiceConstructedAttributes();
-        case NsdPackage.TSERVICE_NS__SERVICE_CD_CS:
+        case NsdPackage.SERVICE_NS__SERVICE_CD_CS:
             return getServiceCDCs();
-        case NsdPackage.TSERVICE_NS__DESC_ID:
+        case NsdPackage.SERVICE_NS__DESC_ID:
             return getDescID();
-        case NsdPackage.TSERVICE_NS__ID:
+        case NsdPackage.SERVICE_NS__ID:
             return getId();
-        case NsdPackage.TSERVICE_NS__PUBLICATION_STAGE:
+        case NsdPackage.SERVICE_NS__PUBLICATION_STAGE:
             return getPublicationStage();
-        case NsdPackage.TSERVICE_NS__RELEASE:
-            return getRelease();
-        case NsdPackage.TSERVICE_NS__REVISION:
+        case NsdPackage.SERVICE_NS__REVISION:
             return getRevision();
-        case NsdPackage.TSERVICE_NS__UML_DATE:
+        case NsdPackage.SERVICE_NS__UML_DATE:
             return getUmlDate();
-        case NsdPackage.TSERVICE_NS__UML_VERSION:
+        case NsdPackage.SERVICE_NS__UML_VERSION:
             return getUmlVersion();
-        case NsdPackage.TSERVICE_NS__VERSION:
-            return getVersion();
         }
         return super.eGet( featureID, resolve, coreType );
     }
@@ -1081,51 +1081,51 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS__CHANGES:
-            setChanges( ( TChanges ) newValue );
+        case NsdPackage.SERVICE_NS__RELEASE:
+            setRelease( ( Integer ) newValue );
+            return;
+        case NsdPackage.SERVICE_NS__VERSION:
+            setVersion( ( Integer ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS:
-            setFunctionalConstraints( ( TFunctionalConstraints ) newValue );
+        case NsdPackage.SERVICE_NS__CHANGES:
+            setChanges( ( Changes ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS:
-            setPresenceConditions( ( TPresenceConditions ) newValue );
+        case NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS:
+            setFunctionalConstraints( ( FunctionalConstraints ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__ABBREVIATIONS:
-            setAbbreviations( ( TAbbreviations ) newValue );
+        case NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS:
+            setPresenceConditions( ( PresenceConditions ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS:
-            setServiceTypeRealizations( ( TServiceTypeRealizations ) newValue );
+        case NsdPackage.SERVICE_NS__ABBREVIATIONS:
+            setAbbreviations( ( Abbreviations ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
-            setServiceConstructedAttributes( ( TServiceConstructedAttributes ) newValue );
+        case NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS:
+            setServiceTypeRealizations( ( ServiceTypeRealizations ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__SERVICE_CD_CS:
-            setServiceCDCs( ( TServiceCDCs ) newValue );
+        case NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
+            setServiceConstructedAttributes( ( ServiceConstructedAttributes ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__DESC_ID:
+        case NsdPackage.SERVICE_NS__SERVICE_CD_CS:
+            setServiceCDCs( ( ServiceCDCs ) newValue );
+            return;
+        case NsdPackage.SERVICE_NS__DESC_ID:
             setDescID( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__ID:
+        case NsdPackage.SERVICE_NS__ID:
             setId( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__PUBLICATION_STAGE:
-            setPublicationStage( ( TPubStage ) newValue );
-            return;
-        case NsdPackage.TSERVICE_NS__RELEASE:
-            setRelease( ( Short ) newValue );
+        case NsdPackage.SERVICE_NS__PUBLICATION_STAGE:
+            setPublicationStage( ( PubStage ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__REVISION:
+        case NsdPackage.SERVICE_NS__REVISION:
             setRevision( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__UML_DATE:
+        case NsdPackage.SERVICE_NS__UML_DATE:
             setUmlDate( ( XMLGregorianCalendar ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__UML_VERSION:
+        case NsdPackage.SERVICE_NS__UML_VERSION:
             setUmlVersion( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS__VERSION:
-            setVersion( ( Integer ) newValue );
-            return;
         }
         super.eSet( featureID, newValue );
     }
@@ -1138,51 +1138,51 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS__CHANGES:
-            setChanges( ( TChanges ) null );
+        case NsdPackage.SERVICE_NS__RELEASE:
+            unsetRelease();
             return;
-        case NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS:
-            setFunctionalConstraints( ( TFunctionalConstraints ) null );
+        case NsdPackage.SERVICE_NS__VERSION:
+            unsetVersion();
+            return;
+        case NsdPackage.SERVICE_NS__CHANGES:
+            setChanges( ( Changes ) null );
+            return;
+        case NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS:
+            setFunctionalConstraints( ( FunctionalConstraints ) null );
             return;
-        case NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS:
-            setPresenceConditions( ( TPresenceConditions ) null );
+        case NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS:
+            setPresenceConditions( ( PresenceConditions ) null );
             return;
-        case NsdPackage.TSERVICE_NS__ABBREVIATIONS:
-            setAbbreviations( ( TAbbreviations ) null );
+        case NsdPackage.SERVICE_NS__ABBREVIATIONS:
+            setAbbreviations( ( Abbreviations ) null );
             return;
-        case NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS:
-            setServiceTypeRealizations( ( TServiceTypeRealizations ) null );
+        case NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS:
+            setServiceTypeRealizations( ( ServiceTypeRealizations ) null );
             return;
-        case NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
-            setServiceConstructedAttributes( ( TServiceConstructedAttributes ) null );
+        case NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
+            setServiceConstructedAttributes( ( ServiceConstructedAttributes ) null );
             return;
-        case NsdPackage.TSERVICE_NS__SERVICE_CD_CS:
-            setServiceCDCs( ( TServiceCDCs ) null );
+        case NsdPackage.SERVICE_NS__SERVICE_CD_CS:
+            setServiceCDCs( ( ServiceCDCs ) null );
             return;
-        case NsdPackage.TSERVICE_NS__DESC_ID:
+        case NsdPackage.SERVICE_NS__DESC_ID:
             setDescID( DESC_ID_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_NS__ID:
+        case NsdPackage.SERVICE_NS__ID:
             setId( ID_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_NS__PUBLICATION_STAGE:
+        case NsdPackage.SERVICE_NS__PUBLICATION_STAGE:
             unsetPublicationStage();
             return;
-        case NsdPackage.TSERVICE_NS__RELEASE:
-            unsetRelease();
-            return;
-        case NsdPackage.TSERVICE_NS__REVISION:
+        case NsdPackage.SERVICE_NS__REVISION:
             unsetRevision();
             return;
-        case NsdPackage.TSERVICE_NS__UML_DATE:
+        case NsdPackage.SERVICE_NS__UML_DATE:
             setUmlDate( UML_DATE_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_NS__UML_VERSION:
+        case NsdPackage.SERVICE_NS__UML_VERSION:
             setUmlVersion( UML_VERSION_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_NS__VERSION:
-            unsetVersion();
-            return;
         }
         super.eUnset( featureID );
     }
@@ -1195,40 +1195,80 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS__CHANGES:
+        case NsdPackage.SERVICE_NS__RELEASE:
+            return isSetRelease();
+        case NsdPackage.SERVICE_NS__VERSION:
+            return isSetVersion();
+        case NsdPackage.SERVICE_NS__CHANGES:
             return changes != null;
-        case NsdPackage.TSERVICE_NS__FUNCTIONAL_CONSTRAINTS:
+        case NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS:
             return functionalConstraints != null;
-        case NsdPackage.TSERVICE_NS__PRESENCE_CONDITIONS:
+        case NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS:
             return presenceConditions != null;
-        case NsdPackage.TSERVICE_NS__ABBREVIATIONS:
+        case NsdPackage.SERVICE_NS__ABBREVIATIONS:
             return abbreviations != null;
-        case NsdPackage.TSERVICE_NS__SERVICE_TYPE_REALIZATIONS:
+        case NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS:
             return serviceTypeRealizations != null;
-        case NsdPackage.TSERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
+        case NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES:
             return serviceConstructedAttributes != null;
-        case NsdPackage.TSERVICE_NS__SERVICE_CD_CS:
+        case NsdPackage.SERVICE_NS__SERVICE_CD_CS:
             return serviceCDCs != null;
-        case NsdPackage.TSERVICE_NS__DESC_ID:
+        case NsdPackage.SERVICE_NS__DESC_ID:
             return DESC_ID_EDEFAULT == null ? descID != null : !DESC_ID_EDEFAULT.equals( descID );
-        case NsdPackage.TSERVICE_NS__ID:
+        case NsdPackage.SERVICE_NS__ID:
             return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals( id );
-        case NsdPackage.TSERVICE_NS__PUBLICATION_STAGE:
+        case NsdPackage.SERVICE_NS__PUBLICATION_STAGE:
             return isSetPublicationStage();
-        case NsdPackage.TSERVICE_NS__RELEASE:
-            return isSetRelease();
-        case NsdPackage.TSERVICE_NS__REVISION:
+        case NsdPackage.SERVICE_NS__REVISION:
             return isSetRevision();
-        case NsdPackage.TSERVICE_NS__UML_DATE:
+        case NsdPackage.SERVICE_NS__UML_DATE:
             return UML_DATE_EDEFAULT == null ? umlDate != null : !UML_DATE_EDEFAULT.equals( umlDate );
-        case NsdPackage.TSERVICE_NS__UML_VERSION:
+        case NsdPackage.SERVICE_NS__UML_VERSION:
             return UML_VERSION_EDEFAULT == null ? umlVersion != null : !UML_VERSION_EDEFAULT.equals( umlVersion );
-        case NsdPackage.TSERVICE_NS__VERSION:
-            return isSetVersion();
         }
         return super.eIsSet( featureID );
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == NSDObjectWithVersionAndRelease.class ) {
+            switch( derivedFeatureID ) {
+            case NsdPackage.SERVICE_NS__RELEASE:
+                return NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE;
+            case NsdPackage.SERVICE_NS__VERSION:
+                return NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION;
+            default:
+                return -1;
+            }
+        }
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == NSDObjectWithVersionAndRelease.class ) {
+            switch( baseFeatureID ) {
+            case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__RELEASE:
+                return NsdPackage.SERVICE_NS__RELEASE;
+            case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE__VERSION:
+                return NsdPackage.SERVICE_NS__VERSION;
+            default:
+                return -1;
+            }
+        }
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
+    }
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1239,7 +1279,17 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
         if( eIsProxy() ) return super.toString();
 
         StringBuilder result = new StringBuilder( super.toString() );
-        result.append( " (descID: " );
+        result.append( " (release: " );
+        if( releaseESet )
+            result.append( release );
+        else
+            result.append( "<unset>" );
+        result.append( ", version: " );
+        if( versionESet )
+            result.append( version );
+        else
+            result.append( "<unset>" );
+        result.append( ", descID: " );
         result.append( descID );
         result.append( ", id: " );
         result.append( id );
@@ -1248,11 +1298,6 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
             result.append( publicationStage );
         else
             result.append( "<unset>" );
-        result.append( ", release: " );
-        if( releaseESet )
-            result.append( release );
-        else
-            result.append( "<unset>" );
         result.append( ", revision: " );
         if( revisionESet )
             result.append( revision );
@@ -1262,13 +1307,8 @@ public class TServiceNSImpl extends TCopyrightedImpl implements TServiceNS {
         result.append( umlDate );
         result.append( ", umlVersion: " );
         result.append( umlVersion );
-        result.append( ", version: " );
-        if( versionESet )
-            result.append( version );
-        else
-            result.append( "<unset>" );
         result.append( ')' );
         return result.toString();
     }
 
-} //TServiceNSImpl
+} //ServiceNSImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceNsUsageImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNsUsageImpl.java
similarity index 56%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceNsUsageImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNsUsageImpl.java
index 135b3cac742920a4299b19fda7b1a8a6508c9073..2f21152ef99f134100b608127ad29804a48609ab 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceNsUsageImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNsUsageImpl.java
@@ -21,8 +21,8 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AppliesToType;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPubStage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage;
 
 import java.util.Collection;
 
@@ -35,30 +35,26 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService Ns Usage</b></em>'.
+ * An implementation of the model object '<em><b>Service Ns Usage</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl#getAppliesTo <em>Applies To</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl#getId <em>Id</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl#getPublicationStage <em>Publication Stage</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl#getRelease <em>Release</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl#getRevision <em>Revision</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceNsUsageImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNsUsageImpl#getAppliesTo <em>Applies To</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNsUsageImpl#getId <em>Id</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNsUsageImpl#getPublicationStage <em>Publication Stage</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceNsUsageImpl#getRevision <em>Revision</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements TServiceNsUsage {
+public class ServiceNsUsageImpl extends NSDObjectWithVersionAndReleaseImpl implements ServiceNsUsage {
     /**
      * The cached value of the '{@link #getAppliesTo() <em>Applies To</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -97,7 +93,7 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
      * @generated
      * @ordered
      */
-    protected static final TPubStage PUBLICATION_STAGE_EDEFAULT = TPubStage.IS;
+    protected static final PubStage PUBLICATION_STAGE_EDEFAULT = PubStage.IS;
 
     /**
      * The cached value of the '{@link #getPublicationStage() <em>Publication Stage</em>}' attribute.
@@ -107,7 +103,7 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
      * @generated
      * @ordered
      */
-    protected TPubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
+    protected PubStage publicationStage = PUBLICATION_STAGE_EDEFAULT;
 
     /**
      * This is true if the Publication Stage attribute has been set.
@@ -118,35 +114,6 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
      */
     protected boolean publicationStageESet;
 
-    /**
-     * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected static final short RELEASE_EDEFAULT = 1;
-
-    /**
-     * The cached value of the '{@link #getRelease() <em>Release</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRelease()
-     * @generated
-     * @ordered
-     */
-    protected short release = RELEASE_EDEFAULT;
-
-    /**
-     * This is true if the Release attribute has been set.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    protected boolean releaseESet;
-
     /**
      * The default value of the '{@link #getRevision() <em>Revision</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -177,40 +144,11 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
     protected boolean revisionESet;
 
     /**
-     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected static final int VERSION_EDEFAULT = 0;
-
-    /**
-     * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getVersion()
-     * @generated
-     * @ordered
-     */
-    protected int version = VERSION_EDEFAULT;
-
-    /**
-     * This is true if the Version attribute has been set.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
-     * @ordered
      */
-    protected boolean versionESet;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected TServiceNsUsageImpl() {
+    protected ServiceNsUsageImpl() {
         super();
     }
 
@@ -221,7 +159,7 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_NS_USAGE;
+        return NsdPackage.Literals.SERVICE_NS_USAGE;
     }
 
     /**
@@ -233,7 +171,7 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
     public EList< AppliesToType > getAppliesTo() {
         if( appliesTo == null ) {
             appliesTo = new EObjectContainmentEList< AppliesToType >( AppliesToType.class, this,
-                    NsdPackage.TSERVICE_NS_USAGE__APPLIES_TO );
+                    NsdPackage.SERVICE_NS_USAGE__APPLIES_TO );
         }
         return appliesTo;
     }
@@ -258,7 +196,7 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
         String oldId = id;
         id = newId;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_NS_USAGE__ID, oldId, id ) );
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS_USAGE__ID, oldId, id ) );
     }
 
     /**
@@ -267,7 +205,7 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
      * @generated
      */
     @Override
-    public TPubStage getPublicationStage() {
+    public PubStage getPublicationStage() {
         return publicationStage;
     }
 
@@ -277,13 +215,13 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
      * @generated
      */
     @Override
-    public void setPublicationStage( TPubStage newPublicationStage ) {
-        TPubStage oldPublicationStage = publicationStage;
+    public void setPublicationStage( PubStage newPublicationStage ) {
+        PubStage oldPublicationStage = publicationStage;
         publicationStage = newPublicationStage == null ? PUBLICATION_STAGE_EDEFAULT : newPublicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStageESet = true;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_NS_USAGE__PUBLICATION_STAGE,
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS_USAGE__PUBLICATION_STAGE,
                     oldPublicationStage, publicationStage, !oldPublicationStageESet ) );
     }
 
@@ -294,12 +232,12 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
      */
     @Override
     public void unsetPublicationStage() {
-        TPubStage oldPublicationStage = publicationStage;
+        PubStage oldPublicationStage = publicationStage;
         boolean oldPublicationStageESet = publicationStageESet;
         publicationStage = PUBLICATION_STAGE_EDEFAULT;
         publicationStageESet = false;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TSERVICE_NS_USAGE__PUBLICATION_STAGE,
+            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS_USAGE__PUBLICATION_STAGE,
                     oldPublicationStage, PUBLICATION_STAGE_EDEFAULT, oldPublicationStageESet ) );
     }
 
@@ -313,56 +251,6 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
         return publicationStageESet;
     }
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public short getRelease() {
-        return release;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void setRelease( short newRelease ) {
-        short oldRelease = release;
-        release = newRelease;
-        boolean oldReleaseESet = releaseESet;
-        releaseESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS_USAGE__RELEASE, oldRelease, release, !oldReleaseESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void unsetRelease() {
-        short oldRelease = release;
-        boolean oldReleaseESet = releaseESet;
-        release = RELEASE_EDEFAULT;
-        releaseESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_NS_USAGE__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean isSetRelease() {
-        return releaseESet;
-    }
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -385,7 +273,7 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
         boolean oldRevisionESet = revisionESet;
         revisionESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS_USAGE__REVISION, oldRevision, revision, !oldRevisionESet ) );
+                NsdPackage.SERVICE_NS_USAGE__REVISION, oldRevision, revision, !oldRevisionESet ) );
     }
 
     /**
@@ -400,7 +288,7 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
         revision = REVISION_EDEFAULT;
         revisionESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_NS_USAGE__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
+                NsdPackage.SERVICE_NS_USAGE__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) );
     }
 
     /**
@@ -413,56 +301,6 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
         return revisionESet;
     }
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int getVersion() {
-        return version;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void setVersion( int newVersion ) {
-        int oldVersion = version;
-        version = newVersion;
-        boolean oldVersionESet = versionESet;
-        versionESet = true;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_NS_USAGE__VERSION, oldVersion, version, !oldVersionESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void unsetVersion() {
-        int oldVersion = version;
-        boolean oldVersionESet = versionESet;
-        version = VERSION_EDEFAULT;
-        versionESet = false;
-        if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_NS_USAGE__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean isSetVersion() {
-        return versionESet;
-    }
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -471,7 +309,7 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS_USAGE__APPLIES_TO:
+        case NsdPackage.SERVICE_NS_USAGE__APPLIES_TO:
             return ( ( InternalEList< ? > ) getAppliesTo() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -485,18 +323,14 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS_USAGE__APPLIES_TO:
+        case NsdPackage.SERVICE_NS_USAGE__APPLIES_TO:
             return getAppliesTo();
-        case NsdPackage.TSERVICE_NS_USAGE__ID:
+        case NsdPackage.SERVICE_NS_USAGE__ID:
             return getId();
-        case NsdPackage.TSERVICE_NS_USAGE__PUBLICATION_STAGE:
+        case NsdPackage.SERVICE_NS_USAGE__PUBLICATION_STAGE:
             return getPublicationStage();
-        case NsdPackage.TSERVICE_NS_USAGE__RELEASE:
-            return getRelease();
-        case NsdPackage.TSERVICE_NS_USAGE__REVISION:
+        case NsdPackage.SERVICE_NS_USAGE__REVISION:
             return getRevision();
-        case NsdPackage.TSERVICE_NS_USAGE__VERSION:
-            return getVersion();
         }
         return super.eGet( featureID, resolve, coreType );
     }
@@ -510,25 +344,19 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS_USAGE__APPLIES_TO:
+        case NsdPackage.SERVICE_NS_USAGE__APPLIES_TO:
             getAppliesTo().clear();
             getAppliesTo().addAll( ( Collection< ? extends AppliesToType > ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS_USAGE__ID:
+        case NsdPackage.SERVICE_NS_USAGE__ID:
             setId( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS_USAGE__PUBLICATION_STAGE:
-            setPublicationStage( ( TPubStage ) newValue );
-            return;
-        case NsdPackage.TSERVICE_NS_USAGE__RELEASE:
-            setRelease( ( Short ) newValue );
+        case NsdPackage.SERVICE_NS_USAGE__PUBLICATION_STAGE:
+            setPublicationStage( ( PubStage ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS_USAGE__REVISION:
+        case NsdPackage.SERVICE_NS_USAGE__REVISION:
             setRevision( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_NS_USAGE__VERSION:
-            setVersion( ( Integer ) newValue );
-            return;
         }
         super.eSet( featureID, newValue );
     }
@@ -541,24 +369,18 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS_USAGE__APPLIES_TO:
+        case NsdPackage.SERVICE_NS_USAGE__APPLIES_TO:
             getAppliesTo().clear();
             return;
-        case NsdPackage.TSERVICE_NS_USAGE__ID:
+        case NsdPackage.SERVICE_NS_USAGE__ID:
             setId( ID_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_NS_USAGE__PUBLICATION_STAGE:
+        case NsdPackage.SERVICE_NS_USAGE__PUBLICATION_STAGE:
             unsetPublicationStage();
             return;
-        case NsdPackage.TSERVICE_NS_USAGE__RELEASE:
-            unsetRelease();
-            return;
-        case NsdPackage.TSERVICE_NS_USAGE__REVISION:
+        case NsdPackage.SERVICE_NS_USAGE__REVISION:
             unsetRevision();
             return;
-        case NsdPackage.TSERVICE_NS_USAGE__VERSION:
-            unsetVersion();
-            return;
         }
         super.eUnset( featureID );
     }
@@ -571,18 +393,14 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_NS_USAGE__APPLIES_TO:
+        case NsdPackage.SERVICE_NS_USAGE__APPLIES_TO:
             return appliesTo != null && !appliesTo.isEmpty();
-        case NsdPackage.TSERVICE_NS_USAGE__ID:
+        case NsdPackage.SERVICE_NS_USAGE__ID:
             return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals( id );
-        case NsdPackage.TSERVICE_NS_USAGE__PUBLICATION_STAGE:
+        case NsdPackage.SERVICE_NS_USAGE__PUBLICATION_STAGE:
             return isSetPublicationStage();
-        case NsdPackage.TSERVICE_NS_USAGE__RELEASE:
-            return isSetRelease();
-        case NsdPackage.TSERVICE_NS_USAGE__REVISION:
+        case NsdPackage.SERVICE_NS_USAGE__REVISION:
             return isSetRevision();
-        case NsdPackage.TSERVICE_NS_USAGE__VERSION:
-            return isSetVersion();
         }
         return super.eIsSet( featureID );
     }
@@ -604,23 +422,13 @@ public class TServiceNsUsageImpl extends MinimalEObjectImpl.Container implements
             result.append( publicationStage );
         else
             result.append( "<unset>" );
-        result.append( ", release: " );
-        if( releaseESet )
-            result.append( release );
-        else
-            result.append( "<unset>" );
         result.append( ", revision: " );
         if( revisionESet )
             result.append( revision );
         else
             result.append( "<unset>" );
-        result.append( ", version: " );
-        if( versionESet )
-            result.append( version );
-        else
-            result.append( "<unset>" );
         result.append( ')' );
         return result.toString();
     }
 
-} //TServiceNsUsageImpl
+} //ServiceNsUsageImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceParameterImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java
similarity index 82%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceParameterImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java
index 709efa56452ad6249231158cd4a344274517c4fc..9bf8d05838e12a4a30797e35d400d7b880868595 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceParameterImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter;
 
 import java.math.BigDecimal;
 
@@ -35,23 +35,23 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService Parameter</b></em>'.
+ * An implementation of the model object '<em><b>Service Parameter</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl#getMaxValue <em>Max Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl#getMinValue <em>Min Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceParameterImpl#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl#getDefaultValue <em>Default Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl#getMaxValue <em>Max Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl#getMinValue <em>Min Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceParameterImpl#getTypeKind <em>Type Kind</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceParameterImpl extends TDocumentedClassImpl implements TServiceParameter {
+public class ServiceParameterImpl extends DocumentedClassImpl implements ServiceParameter {
     /**
      * The default value of the '{@link #getDefaultValue() <em>Default Value</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -161,7 +161,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
      * @ordered
      */
     protected static final Enumerator TYPE_KIND_EDEFAULT = ( Enumerator ) NsdFactory.eINSTANCE
-            .createFromString( NsdPackage.eINSTANCE.getTAttributeTypeKind(), "BASIC" );
+            .createFromString( NsdPackage.eINSTANCE.getAttributeTypeKind(), "BASIC" );
 
     /**
      * The cached value of the '{@link #getTypeKind() <em>Type Kind</em>}' attribute.
@@ -187,7 +187,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceParameterImpl() {
+    protected ServiceParameterImpl() {
         super();
     }
 
@@ -198,7 +198,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_PARAMETER;
+        return NsdPackage.Literals.SERVICE_PARAMETER;
     }
 
     /**
@@ -221,7 +221,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
         String oldDefaultValue = defaultValue;
         defaultValue = newDefaultValue;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_PARAMETER__DEFAULT_VALUE, oldDefaultValue, defaultValue ) );
+                NsdPackage.SERVICE_PARAMETER__DEFAULT_VALUE, oldDefaultValue, defaultValue ) );
     }
 
     /**
@@ -244,7 +244,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
         BigDecimal oldMaxValue = maxValue;
         maxValue = newMaxValue;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_PARAMETER__MAX_VALUE, oldMaxValue, maxValue ) );
+                NsdPackage.SERVICE_PARAMETER__MAX_VALUE, oldMaxValue, maxValue ) );
     }
 
     /**
@@ -267,7 +267,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
         BigDecimal oldMinValue = minValue;
         minValue = newMinValue;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_PARAMETER__MIN_VALUE, oldMinValue, minValue ) );
+                NsdPackage.SERVICE_PARAMETER__MIN_VALUE, oldMinValue, minValue ) );
     }
 
     /**
@@ -290,7 +290,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
         String oldName = name;
         name = newName;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_PARAMETER__NAME, oldName, name ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__NAME, oldName, name ) );
     }
 
     /**
@@ -313,7 +313,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
         String oldType = type;
         type = newType;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_PARAMETER__TYPE, oldType, type ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__TYPE, oldType, type ) );
     }
 
     /**
@@ -338,7 +338,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
         boolean oldTypeKindESet = typeKindESet;
         typeKindESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_PARAMETER__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
+                NsdPackage.SERVICE_PARAMETER__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
     }
 
     /**
@@ -353,7 +353,7 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
         typeKind = TYPE_KIND_EDEFAULT;
         typeKindESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_PARAMETER__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
+                NsdPackage.SERVICE_PARAMETER__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
     }
 
     /**
@@ -374,17 +374,17 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_PARAMETER__DEFAULT_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__DEFAULT_VALUE:
             return getDefaultValue();
-        case NsdPackage.TSERVICE_PARAMETER__MAX_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MAX_VALUE:
             return getMaxValue();
-        case NsdPackage.TSERVICE_PARAMETER__MIN_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MIN_VALUE:
             return getMinValue();
-        case NsdPackage.TSERVICE_PARAMETER__NAME:
+        case NsdPackage.SERVICE_PARAMETER__NAME:
             return getName();
-        case NsdPackage.TSERVICE_PARAMETER__TYPE:
+        case NsdPackage.SERVICE_PARAMETER__TYPE:
             return getType();
-        case NsdPackage.TSERVICE_PARAMETER__TYPE_KIND:
+        case NsdPackage.SERVICE_PARAMETER__TYPE_KIND:
             return getTypeKind();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -398,22 +398,22 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_PARAMETER__DEFAULT_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__DEFAULT_VALUE:
             setDefaultValue( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__MAX_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MAX_VALUE:
             setMaxValue( ( BigDecimal ) newValue );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__MIN_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MIN_VALUE:
             setMinValue( ( BigDecimal ) newValue );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__NAME:
+        case NsdPackage.SERVICE_PARAMETER__NAME:
             setName( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__TYPE:
+        case NsdPackage.SERVICE_PARAMETER__TYPE:
             setType( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__TYPE_KIND:
+        case NsdPackage.SERVICE_PARAMETER__TYPE_KIND:
             setTypeKind( ( Enumerator ) newValue );
             return;
         }
@@ -428,22 +428,22 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_PARAMETER__DEFAULT_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__DEFAULT_VALUE:
             setDefaultValue( DEFAULT_VALUE_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__MAX_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MAX_VALUE:
             setMaxValue( MAX_VALUE_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__MIN_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MIN_VALUE:
             setMinValue( MIN_VALUE_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__NAME:
+        case NsdPackage.SERVICE_PARAMETER__NAME:
             setName( NAME_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__TYPE:
+        case NsdPackage.SERVICE_PARAMETER__TYPE:
             setType( TYPE_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_PARAMETER__TYPE_KIND:
+        case NsdPackage.SERVICE_PARAMETER__TYPE_KIND:
             unsetTypeKind();
             return;
         }
@@ -458,18 +458,18 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_PARAMETER__DEFAULT_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__DEFAULT_VALUE:
             return DEFAULT_VALUE_EDEFAULT == null ? defaultValue != null
                     : !DEFAULT_VALUE_EDEFAULT.equals( defaultValue );
-        case NsdPackage.TSERVICE_PARAMETER__MAX_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MAX_VALUE:
             return MAX_VALUE_EDEFAULT == null ? maxValue != null : !MAX_VALUE_EDEFAULT.equals( maxValue );
-        case NsdPackage.TSERVICE_PARAMETER__MIN_VALUE:
+        case NsdPackage.SERVICE_PARAMETER__MIN_VALUE:
             return MIN_VALUE_EDEFAULT == null ? minValue != null : !MIN_VALUE_EDEFAULT.equals( minValue );
-        case NsdPackage.TSERVICE_PARAMETER__NAME:
+        case NsdPackage.SERVICE_PARAMETER__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
-        case NsdPackage.TSERVICE_PARAMETER__TYPE:
+        case NsdPackage.SERVICE_PARAMETER__TYPE:
             return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals( type );
-        case NsdPackage.TSERVICE_PARAMETER__TYPE_KIND:
+        case NsdPackage.SERVICE_PARAMETER__TYPE_KIND:
             return isSetTypeKind();
         }
         return super.eIsSet( featureID );
@@ -504,4 +504,4 @@ public class TServiceParameterImpl extends TDocumentedClassImpl implements TServ
         return result.toString();
     }
 
-} //TServiceParameterImpl
+} //ServiceParameterImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeImpl.java
index b16abc874fe6b2eaa958a372ee7ac7d6d7a083ba..5cc932ba0c633c63b26e06e0749382b36a83c70d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ACSIServicesKind;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceType;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TACSIServicesKind;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -52,7 +52,7 @@ public class ServiceTypeImpl extends MinimalEObjectImpl.Container implements Ser
      * @generated
      * @ordered
      */
-    protected static final TACSIServicesKind NAME_EDEFAULT = TACSIServicesKind.ASSOCIATE;
+    protected static final ACSIServicesKind NAME_EDEFAULT = ACSIServicesKind.ASSOCIATE;
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -62,7 +62,7 @@ public class ServiceTypeImpl extends MinimalEObjectImpl.Container implements Ser
      * @generated
      * @ordered
      */
-    protected TACSIServicesKind name = NAME_EDEFAULT;
+    protected ACSIServicesKind name = NAME_EDEFAULT;
 
     /**
      * This is true if the Name attribute has been set.
@@ -98,7 +98,7 @@ public class ServiceTypeImpl extends MinimalEObjectImpl.Container implements Ser
      * @generated
      */
     @Override
-    public TACSIServicesKind getName() {
+    public ACSIServicesKind getName() {
         return name;
     }
 
@@ -108,8 +108,8 @@ public class ServiceTypeImpl extends MinimalEObjectImpl.Container implements Ser
      * @generated
      */
     @Override
-    public void setName( TACSIServicesKind newName ) {
-        TACSIServicesKind oldName = name;
+    public void setName( ACSIServicesKind newName ) {
+        ACSIServicesKind oldName = name;
         name = newName == null ? NAME_EDEFAULT : newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
@@ -124,7 +124,7 @@ public class ServiceTypeImpl extends MinimalEObjectImpl.Container implements Ser
      */
     @Override
     public void unsetName() {
-        TACSIServicesKind oldName = name;
+        ACSIServicesKind oldName = name;
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
@@ -165,7 +165,7 @@ public class ServiceTypeImpl extends MinimalEObjectImpl.Container implements Ser
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
         case NsdPackage.SERVICE_TYPE__NAME:
-            setName( ( TACSIServicesKind ) newValue );
+            setName( ( ACSIServicesKind ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceTypeRealizationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationImpl.java
similarity index 80%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceTypeRealizationImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationImpl.java
index dd7926f1b87cc05d86fd217bc867533c8a150ec8..f031020d9613cf6eaa6708ff8b7120eb5731dcf5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceTypeRealizationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationImpl.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -34,24 +34,24 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService Type Realization</b></em>'.
+ * An implementation of the model object '<em><b>Service Type Realization</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl#getFc <em>Fc</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationImpl#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl#getFc <em>Fc</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationImpl#getTypeKind <em>Type Kind</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container implements TServiceTypeRealization {
+public class ServiceTypeRealizationImpl extends MinimalEObjectImpl.Container implements ServiceTypeRealization {
     /**
      * The default value of the '{@link #getFc() <em>Fc</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -190,7 +190,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
      * @ordered
      */
     protected static final Enumerator TYPE_KIND_EDEFAULT = ( Enumerator ) NsdFactory.eINSTANCE
-            .createFromString( NsdPackage.eINSTANCE.getTAttributeTypeKind(), "BASIC" );
+            .createFromString( NsdPackage.eINSTANCE.getAttributeTypeKind(), "BASIC" );
 
     /**
      * The cached value of the '{@link #getTypeKind() <em>Type Kind</em>}' attribute.
@@ -216,7 +216,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceTypeRealizationImpl() {
+    protected ServiceTypeRealizationImpl() {
         super();
     }
 
@@ -227,7 +227,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_TYPE_REALIZATION;
+        return NsdPackage.Literals.SERVICE_TYPE_REALIZATION;
     }
 
     /**
@@ -250,7 +250,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         String oldFc = fc;
         fc = newFc;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSERVICE_TYPE_REALIZATION__FC, oldFc, fc ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_TYPE_REALIZATION__FC, oldFc, fc ) );
     }
 
     /**
@@ -273,7 +273,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         String oldName = name;
         name = newName;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_TYPE_REALIZATION__NAME, oldName, name ) );
+                NsdPackage.SERVICE_TYPE_REALIZATION__NAME, oldName, name ) );
     }
 
     /**
@@ -298,7 +298,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         boolean oldPresCondESet = presCondESet;
         presCondESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
+                NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
     }
 
     /**
@@ -313,7 +313,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         presCond = PRES_COND_EDEFAULT;
         presCondESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
+                NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
     }
 
     /**
@@ -346,7 +346,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         String oldPresCondArgs = presCondArgs;
         presCondArgs = newPresCondArgs;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
+                NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
     }
 
     /**
@@ -369,7 +369,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         String oldPresCondArgsID = presCondArgsID;
         presCondArgsID = newPresCondArgsID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
+                NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
     }
 
     /**
@@ -392,7 +392,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         String oldType = type;
         type = newType;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE, oldType, type ) );
+                NsdPackage.SERVICE_TYPE_REALIZATION__TYPE, oldType, type ) );
     }
 
     /**
@@ -417,7 +417,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         boolean oldTypeKindESet = typeKindESet;
         typeKindESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
+                NsdPackage.SERVICE_TYPE_REALIZATION__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
     }
 
     /**
@@ -432,7 +432,7 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         typeKind = TYPE_KIND_EDEFAULT;
         typeKindESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
+                NsdPackage.SERVICE_TYPE_REALIZATION__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
     }
 
     /**
@@ -453,19 +453,19 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__FC:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__FC:
             return getFc();
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__NAME:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__NAME:
             return getName();
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND:
             return getPresCond();
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
             return getPresCondArgs();
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
             return getPresCondArgsID();
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE:
             return getType();
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE_KIND:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE_KIND:
             return getTypeKind();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -479,25 +479,25 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__FC:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__FC:
             setFc( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__NAME:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__NAME:
             setName( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND:
             setPresCond( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
             setPresCondArgs( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
             setPresCondArgsID( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE:
             setType( ( String ) newValue );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE_KIND:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE_KIND:
             setTypeKind( ( Enumerator ) newValue );
             return;
         }
@@ -512,25 +512,25 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__FC:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__FC:
             setFc( FC_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__NAME:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__NAME:
             setName( NAME_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND:
             unsetPresCond();
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
             setPresCondArgs( PRES_COND_ARGS_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
             setPresCondArgsID( PRES_COND_ARGS_ID_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE:
             setType( TYPE_EDEFAULT );
             return;
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE_KIND:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE_KIND:
             unsetTypeKind();
             return;
         }
@@ -545,21 +545,21 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__FC:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__FC:
             return FC_EDEFAULT == null ? fc != null : !FC_EDEFAULT.equals( fc );
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__NAME:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND:
             return isSetPresCond();
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS:
             return PRES_COND_ARGS_EDEFAULT == null ? presCondArgs != null
                     : !PRES_COND_ARGS_EDEFAULT.equals( presCondArgs );
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__PRES_COND_ARGS_ID:
             return PRES_COND_ARGS_ID_EDEFAULT == null ? presCondArgsID != null
                     : !PRES_COND_ARGS_ID_EDEFAULT.equals( presCondArgsID );
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE:
             return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals( type );
-        case NsdPackage.TSERVICE_TYPE_REALIZATION__TYPE_KIND:
+        case NsdPackage.SERVICE_TYPE_REALIZATION__TYPE_KIND:
             return isSetTypeKind();
         }
         return super.eIsSet( featureID );
@@ -599,4 +599,4 @@ public class TServiceTypeRealizationImpl extends MinimalEObjectImpl.Container im
         return result.toString();
     }
 
-} //TServiceTypeRealizationImpl
+} //ServiceTypeRealizationImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceTypeRealizationsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationsImpl.java
similarity index 75%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceTypeRealizationsImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationsImpl.java
index 7a7bdd909eeaff35c204ea9f5aa50140cd92c532..5d7837c031181216183f2be3c8c390d6c21ecee8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TServiceTypeRealizationsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationsImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations;
 
 import java.util.Collection;
 
@@ -39,18 +39,18 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TService Type Realizations</b></em>'.
+ * An implementation of the model object '<em><b>Service Type Realizations</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TServiceTypeRealizationsImpl#getServiceTypeRealization <em>Service Type Realization</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.ServiceTypeRealizationsImpl#getServiceTypeRealization <em>Service Type Realization</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container implements TServiceTypeRealizations {
+public class ServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container implements ServiceTypeRealizations {
     /**
      * The cached value of the '{@link #getServiceTypeRealization() <em>Service Type Realization</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -59,14 +59,14 @@ public class TServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container i
      * @generated
      * @ordered
      */
-    protected EList< TConstructedAttribute > serviceTypeRealization;
+    protected EList< ConstructedAttribute > serviceTypeRealization;
 
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TServiceTypeRealizationsImpl() {
+    protected ServiceTypeRealizationsImpl() {
         super();
     }
 
@@ -77,7 +77,7 @@ public class TServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container i
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSERVICE_TYPE_REALIZATIONS;
+        return NsdPackage.Literals.SERVICE_TYPE_REALIZATIONS;
     }
 
     /**
@@ -86,10 +86,10 @@ public class TServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container i
      * @generated
      */
     @Override
-    public EList< TConstructedAttribute > getServiceTypeRealization() {
+    public EList< ConstructedAttribute > getServiceTypeRealization() {
         if( serviceTypeRealization == null ) {
-            serviceTypeRealization = new EObjectContainmentEList< TConstructedAttribute >( TConstructedAttribute.class,
-                    this, NsdPackage.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION );
+            serviceTypeRealization = new EObjectContainmentEList< ConstructedAttribute >( ConstructedAttribute.class,
+                    this, NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION );
         }
         return serviceTypeRealization;
     }
@@ -102,7 +102,7 @@ public class TServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container i
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
+        case NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
             return ( ( InternalEList< ? > ) getServiceTypeRealization() ).basicRemove( otherEnd, msgs );
         }
         return super.eInverseRemove( otherEnd, featureID, msgs );
@@ -116,7 +116,7 @@ public class TServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container i
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
+        case NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
             return getServiceTypeRealization();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -131,9 +131,9 @@ public class TServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container i
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
+        case NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
             getServiceTypeRealization().clear();
-            getServiceTypeRealization().addAll( ( Collection< ? extends TConstructedAttribute > ) newValue );
+            getServiceTypeRealization().addAll( ( Collection< ? extends ConstructedAttribute > ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -147,7 +147,7 @@ public class TServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container i
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
+        case NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
             getServiceTypeRealization().clear();
             return;
         }
@@ -162,10 +162,10 @@ public class TServiceTypeRealizationsImpl extends MinimalEObjectImpl.Container i
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
+        case NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION:
             return serviceTypeRealization != null && !serviceTypeRealization.isEmpty();
         }
         return super.eIsSet( featureID );
     }
 
-} //TServiceTypeRealizationsImpl
+} //ServiceTypeRealizationsImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TSubDataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java
similarity index 81%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TSubDataAttributeImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java
index 58a8777f92f3a40519317aa2d12e8c28e929a49e..3bbffb35de4c516ad49a34a985bf6e599f40360f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TSubDataAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java
@@ -21,7 +21,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute;
 
 import java.math.BigDecimal;
 
@@ -35,30 +35,30 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TSub Data Attribute</b></em>'.
+ * An implementation of the model object '<em><b>Sub Data Attribute</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#isIsArray <em>Is Array</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getMaxValue <em>Max Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getMinIndex <em>Min Index</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getMinValue <em>Min Value</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getSizeAttribute <em>Size Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataAttributeImpl#getTypeKind <em>Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getDefaultValue <em>Default Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#isIsArray <em>Is Array</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getMaxValue <em>Max Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getMinIndex <em>Min Index</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getMinValue <em>Min Value</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getSizeAttribute <em>Size Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataAttributeImpl#getTypeKind <em>Type Kind</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubDataAttribute {
+public class SubDataAttributeImpl extends DocumentedClassImpl implements SubDataAttribute {
     /**
      * The default value of the '{@link #getDefaultValue() <em>Default Value</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -335,7 +335,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
      * @ordered
      */
     protected static final Enumerator TYPE_KIND_EDEFAULT = ( Enumerator ) NsdFactory.eINSTANCE
-            .createFromString( NsdPackage.eINSTANCE.getTAttributeTypeKind(), "BASIC" );
+            .createFromString( NsdPackage.eINSTANCE.getAttributeTypeKind(), "BASIC" );
 
     /**
      * The cached value of the '{@link #getTypeKind() <em>Type Kind</em>}' attribute.
@@ -361,7 +361,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TSubDataAttributeImpl() {
+    protected SubDataAttributeImpl() {
         super();
     }
 
@@ -372,7 +372,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSUB_DATA_ATTRIBUTE;
+        return NsdPackage.Literals.SUB_DATA_ATTRIBUTE;
     }
 
     /**
@@ -395,7 +395,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         String oldDefaultValue = defaultValue;
         defaultValue = newDefaultValue;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE, oldDefaultValue, defaultValue ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__DEFAULT_VALUE, oldDefaultValue, defaultValue ) );
     }
 
     /**
@@ -420,7 +420,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         boolean oldIsArrayESet = isArrayESet;
         isArrayESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) );
     }
 
     /**
@@ -435,7 +435,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         isArray = IS_ARRAY_EDEFAULT;
         isArrayESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) );
     }
 
     /**
@@ -468,7 +468,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         String oldMaxIndexAttribute = maxIndexAttribute;
         maxIndexAttribute = newMaxIndexAttribute;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, oldMaxIndexAttribute, maxIndexAttribute ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, oldMaxIndexAttribute, maxIndexAttribute ) );
     }
 
     /**
@@ -491,7 +491,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         BigDecimal oldMaxValue = maxValue;
         maxValue = newMaxValue;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, maxValue ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, maxValue ) );
     }
 
     /**
@@ -516,7 +516,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         boolean oldMinIndexESet = minIndexESet;
         minIndexESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) );
     }
 
     /**
@@ -531,7 +531,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         minIndex = MIN_INDEX_EDEFAULT;
         minIndexESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) );
     }
 
     /**
@@ -564,7 +564,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         BigDecimal oldMinValue = minValue;
         minValue = newMinValue;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_VALUE, oldMinValue, minValue ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE, oldMinValue, minValue ) );
     }
 
     /**
@@ -587,7 +587,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         String oldName = name;
         name = newName;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSUB_DATA_ATTRIBUTE__NAME, oldName, name ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__NAME, oldName, name ) );
     }
 
     /**
@@ -612,7 +612,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         boolean oldPresCondESet = presCondESet;
         presCondESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
     }
 
     /**
@@ -627,7 +627,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         presCond = PRES_COND_EDEFAULT;
         presCondESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
     }
 
     /**
@@ -660,7 +660,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         String oldPresCondArgs = presCondArgs;
         presCondArgs = newPresCondArgs;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
     }
 
     /**
@@ -683,7 +683,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         String oldPresCondArgsID = presCondArgsID;
         presCondArgsID = newPresCondArgsID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
     }
 
     /**
@@ -706,7 +706,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         String oldSizeAttribute = sizeAttribute;
         sizeAttribute = newSizeAttribute;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE, oldSizeAttribute, sizeAttribute ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE, oldSizeAttribute, sizeAttribute ) );
     }
 
     /**
@@ -729,7 +729,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         String oldType = type;
         type = newType;
         if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE, oldType, type ) );
+                new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__TYPE, oldType, type ) );
     }
 
     /**
@@ -754,7 +754,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         boolean oldTypeKindESet = typeKindESet;
         typeKindESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) );
     }
 
     /**
@@ -769,7 +769,7 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         typeKind = TYPE_KIND_EDEFAULT;
         typeKindESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
+                NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) );
     }
 
     /**
@@ -790,31 +790,31 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
             return getDefaultValue();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY:
             return isIsArray();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
             return getMaxIndexAttribute();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE:
             return getMaxValue();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX:
             return getMinIndex();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE:
             return getMinValue();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__NAME:
             return getName();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND:
             return getPresCond();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
             return getPresCondArgs();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             return getPresCondArgsID();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
             return getSizeAttribute();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE:
             return getType();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND:
             return getTypeKind();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -828,43 +828,43 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
             setDefaultValue( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY:
             setIsArray( ( Boolean ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
             setMaxIndexAttribute( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE:
             setMaxValue( ( BigDecimal ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX:
             setMinIndex( ( Long ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE:
             setMinValue( ( BigDecimal ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__NAME:
             setName( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND:
             setPresCond( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
             setPresCondArgs( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             setPresCondArgsID( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
             setSizeAttribute( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE:
             setType( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND:
             setTypeKind( ( Enumerator ) newValue );
             return;
         }
@@ -879,43 +879,43 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
             setDefaultValue( DEFAULT_VALUE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY:
             unsetIsArray();
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
             setMaxIndexAttribute( MAX_INDEX_ATTRIBUTE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE:
             setMaxValue( MAX_VALUE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX:
             unsetMinIndex();
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE:
             setMinValue( MIN_VALUE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__NAME:
             setName( NAME_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND:
             unsetPresCond();
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
             setPresCondArgs( PRES_COND_ARGS_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             setPresCondArgsID( PRES_COND_ARGS_ID_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
             setSizeAttribute( SIZE_ATTRIBUTE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE:
             setType( TYPE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND:
             unsetTypeKind();
             return;
         }
@@ -930,36 +930,36 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__DEFAULT_VALUE:
             return DEFAULT_VALUE_EDEFAULT == null ? defaultValue != null
                     : !DEFAULT_VALUE_EDEFAULT.equals( defaultValue );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__IS_ARRAY:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY:
             return isSetIsArray();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE:
             return MAX_INDEX_ATTRIBUTE_EDEFAULT == null ? maxIndexAttribute != null
                     : !MAX_INDEX_ATTRIBUTE_EDEFAULT.equals( maxIndexAttribute );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MAX_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE:
             return MAX_VALUE_EDEFAULT == null ? maxValue != null : !MAX_VALUE_EDEFAULT.equals( maxValue );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_INDEX:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX:
             return isSetMinIndex();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__MIN_VALUE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE:
             return MIN_VALUE_EDEFAULT == null ? minValue != null : !MIN_VALUE_EDEFAULT.equals( minValue );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__NAME:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND:
             return isSetPresCond();
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS:
             return PRES_COND_ARGS_EDEFAULT == null ? presCondArgs != null
                     : !PRES_COND_ARGS_EDEFAULT.equals( presCondArgs );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS_ID:
             return PRES_COND_ARGS_ID_EDEFAULT == null ? presCondArgsID != null
                     : !PRES_COND_ARGS_ID_EDEFAULT.equals( presCondArgsID );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__SIZE_ATTRIBUTE:
             return SIZE_ATTRIBUTE_EDEFAULT == null ? sizeAttribute != null
                     : !SIZE_ATTRIBUTE_EDEFAULT.equals( sizeAttribute );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE:
             return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals( type );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE__TYPE_KIND:
+        case NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND:
             return isSetTypeKind();
         }
         return super.eIsSet( featureID );
@@ -1017,4 +1017,4 @@ public class TSubDataAttributeImpl extends TDocumentedClassImpl implements TSubD
         return result.toString();
     }
 
-} //TSubDataAttributeImpl
+} //SubDataAttributeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TSubDataObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java
similarity index 79%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TSubDataObjectImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java
index 5a06c65586c04563dc55a5f06633ecbccdb03424..794ede09aa25f2852b62d47c5d7bba02e5b7e985 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TSubDataObjectImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java
@@ -19,9 +19,9 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDefinedAttributeTypeKind;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -31,28 +31,28 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TSub Data Object</b></em>'.
+ * An implementation of the model object '<em><b>Sub Data Object</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#isIsArray <em>Is Array</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getMinIndex <em>Min Index</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getName <em>Name</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getPresCond <em>Pres Cond</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getSizeAttribute <em>Size Attribute</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getType <em>Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getUnderlyingType <em>Underlying Type</em>}</li>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TSubDataObjectImpl#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#isIsArray <em>Is Array</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getMaxIndexAttribute <em>Max Index Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getMinIndex <em>Min Index</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getName <em>Name</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getPresCond <em>Pres Cond</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getPresCondArgs <em>Pres Cond Args</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getPresCondArgsID <em>Pres Cond Args ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getSizeAttribute <em>Size Attribute</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getType <em>Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getUnderlyingType <em>Underlying Type</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.SubDataObjectImpl#getUnderlyingTypeKind <em>Underlying Type Kind</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubDataObject {
+public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObject {
     /**
      * The default value of the '{@link #isIsArray() <em>Is Array</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
      * @generated
      * @ordered
      */
-    protected static final TDefinedAttributeTypeKind UNDERLYING_TYPE_KIND_EDEFAULT = TDefinedAttributeTypeKind.BASIC;
+    protected static final DefinedAttributeTypeKind UNDERLYING_TYPE_KIND_EDEFAULT = DefinedAttributeTypeKind.BASIC;
 
     /**
      * The cached value of the '{@link #getUnderlyingTypeKind() <em>Underlying Type Kind</em>}' attribute.
@@ -298,7 +298,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
      * @generated
      * @ordered
      */
-    protected TDefinedAttributeTypeKind underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT;
+    protected DefinedAttributeTypeKind underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT;
 
     /**
      * This is true if the Underlying Type Kind attribute has been set.
@@ -314,7 +314,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TSubDataObjectImpl() {
+    protected SubDataObjectImpl() {
         super();
     }
 
@@ -325,7 +325,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TSUB_DATA_OBJECT;
+        return NsdPackage.Literals.SUB_DATA_OBJECT;
     }
 
     /**
@@ -350,7 +350,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         boolean oldIsArrayESet = isArrayESet;
         isArrayESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_OBJECT__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) );
+                NsdPackage.SUB_DATA_OBJECT__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) );
     }
 
     /**
@@ -365,7 +365,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         isArray = IS_ARRAY_EDEFAULT;
         isArrayESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSUB_DATA_OBJECT__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) );
+                NsdPackage.SUB_DATA_OBJECT__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) );
     }
 
     /**
@@ -398,7 +398,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         String oldMaxIndexAttribute = maxIndexAttribute;
         maxIndexAttribute = newMaxIndexAttribute;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE, oldMaxIndexAttribute, maxIndexAttribute ) );
+                NsdPackage.SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE, oldMaxIndexAttribute, maxIndexAttribute ) );
     }
 
     /**
@@ -423,7 +423,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         boolean oldMinIndexESet = minIndexESet;
         minIndexESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_OBJECT__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) );
+                NsdPackage.SUB_DATA_OBJECT__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) );
     }
 
     /**
@@ -438,7 +438,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         minIndex = MIN_INDEX_EDEFAULT;
         minIndexESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSUB_DATA_OBJECT__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) );
+                NsdPackage.SUB_DATA_OBJECT__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) );
     }
 
     /**
@@ -470,8 +470,8 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
     public void setName( String newName ) {
         String oldName = name;
         name = newName;
-        if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSUB_DATA_OBJECT__NAME, oldName, name ) );
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__NAME, oldName, name ) );
     }
 
     /**
@@ -496,7 +496,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         boolean oldPresCondESet = presCondESet;
         presCondESet = true;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_OBJECT__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
+                NsdPackage.SUB_DATA_OBJECT__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) );
     }
 
     /**
@@ -511,7 +511,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         presCond = PRES_COND_EDEFAULT;
         presCondESet = false;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET,
-                NsdPackage.TSUB_DATA_OBJECT__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
+                NsdPackage.SUB_DATA_OBJECT__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) );
     }
 
     /**
@@ -544,7 +544,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         String oldPresCondArgs = presCondArgs;
         presCondArgs = newPresCondArgs;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
+                NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS, oldPresCondArgs, presCondArgs ) );
     }
 
     /**
@@ -567,7 +567,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         String oldPresCondArgsID = presCondArgsID;
         presCondArgsID = newPresCondArgsID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
+                NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID ) );
     }
 
     /**
@@ -590,7 +590,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         String oldSizeAttribute = sizeAttribute;
         sizeAttribute = newSizeAttribute;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_OBJECT__SIZE_ATTRIBUTE, oldSizeAttribute, sizeAttribute ) );
+                NsdPackage.SUB_DATA_OBJECT__SIZE_ATTRIBUTE, oldSizeAttribute, sizeAttribute ) );
     }
 
     /**
@@ -612,8 +612,8 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
     public void setType( String newType ) {
         String oldType = type;
         type = newType;
-        if( eNotificationRequired() ) eNotify(
-                new ENotificationImpl( this, Notification.SET, NsdPackage.TSUB_DATA_OBJECT__TYPE, oldType, type ) );
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__TYPE, oldType, type ) );
     }
 
     /**
@@ -636,7 +636,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         String oldUnderlyingType = underlyingType;
         underlyingType = newUnderlyingType;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE, oldUnderlyingType, underlyingType ) );
+                NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE, oldUnderlyingType, underlyingType ) );
     }
 
     /**
@@ -645,7 +645,7 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
      * @generated
      */
     @Override
-    public TDefinedAttributeTypeKind getUnderlyingTypeKind() {
+    public DefinedAttributeTypeKind getUnderlyingTypeKind() {
         return underlyingTypeKind;
     }
 
@@ -655,13 +655,13 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
      * @generated
      */
     @Override
-    public void setUnderlyingTypeKind( TDefinedAttributeTypeKind newUnderlyingTypeKind ) {
-        TDefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
+    public void setUnderlyingTypeKind( DefinedAttributeTypeKind newUnderlyingTypeKind ) {
+        DefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
         underlyingTypeKind = newUnderlyingTypeKind == null ? UNDERLYING_TYPE_KIND_EDEFAULT : newUnderlyingTypeKind;
         boolean oldUnderlyingTypeKindESet = underlyingTypeKindESet;
         underlyingTypeKindESet = true;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND,
+            eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND,
                     oldUnderlyingTypeKind, underlyingTypeKind, !oldUnderlyingTypeKindESet ) );
     }
 
@@ -672,12 +672,12 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
      */
     @Override
     public void unsetUnderlyingTypeKind() {
-        TDefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
+        DefinedAttributeTypeKind oldUnderlyingTypeKind = underlyingTypeKind;
         boolean oldUnderlyingTypeKindESet = underlyingTypeKindESet;
         underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT;
         underlyingTypeKindESet = false;
         if( eNotificationRequired() )
-            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND,
+            eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND,
                     oldUnderlyingTypeKind, UNDERLYING_TYPE_KIND_EDEFAULT, oldUnderlyingTypeKindESet ) );
     }
 
@@ -699,27 +699,27 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TSUB_DATA_OBJECT__IS_ARRAY:
+        case NsdPackage.SUB_DATA_OBJECT__IS_ARRAY:
             return isIsArray();
-        case NsdPackage.TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
             return getMaxIndexAttribute();
-        case NsdPackage.TSUB_DATA_OBJECT__MIN_INDEX:
+        case NsdPackage.SUB_DATA_OBJECT__MIN_INDEX:
             return getMinIndex();
-        case NsdPackage.TSUB_DATA_OBJECT__NAME:
+        case NsdPackage.SUB_DATA_OBJECT__NAME:
             return getName();
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND:
             return getPresCond();
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS:
             return getPresCondArgs();
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS_ID:
             return getPresCondArgsID();
-        case NsdPackage.TSUB_DATA_OBJECT__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__SIZE_ATTRIBUTE:
             return getSizeAttribute();
-        case NsdPackage.TSUB_DATA_OBJECT__TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__TYPE:
             return getType();
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE:
             return getUnderlyingType();
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
             return getUnderlyingTypeKind();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -733,38 +733,38 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TSUB_DATA_OBJECT__IS_ARRAY:
+        case NsdPackage.SUB_DATA_OBJECT__IS_ARRAY:
             setIsArray( ( Boolean ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
             setMaxIndexAttribute( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__MIN_INDEX:
+        case NsdPackage.SUB_DATA_OBJECT__MIN_INDEX:
             setMinIndex( ( Long ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__NAME:
+        case NsdPackage.SUB_DATA_OBJECT__NAME:
             setName( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND:
             setPresCond( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS:
             setPresCondArgs( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS_ID:
             setPresCondArgsID( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__SIZE_ATTRIBUTE:
             setSizeAttribute( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__TYPE:
             setType( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE:
             setUnderlyingType( ( String ) newValue );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
-            setUnderlyingTypeKind( ( TDefinedAttributeTypeKind ) newValue );
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
+            setUnderlyingTypeKind( ( DefinedAttributeTypeKind ) newValue );
             return;
         }
         super.eSet( featureID, newValue );
@@ -778,37 +778,37 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSUB_DATA_OBJECT__IS_ARRAY:
+        case NsdPackage.SUB_DATA_OBJECT__IS_ARRAY:
             unsetIsArray();
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
             setMaxIndexAttribute( MAX_INDEX_ATTRIBUTE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__MIN_INDEX:
+        case NsdPackage.SUB_DATA_OBJECT__MIN_INDEX:
             unsetMinIndex();
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__NAME:
+        case NsdPackage.SUB_DATA_OBJECT__NAME:
             setName( NAME_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND:
             unsetPresCond();
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS:
             setPresCondArgs( PRES_COND_ARGS_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS_ID:
             setPresCondArgsID( PRES_COND_ARGS_ID_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__SIZE_ATTRIBUTE:
             setSizeAttribute( SIZE_ATTRIBUTE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__TYPE:
             setType( TYPE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE:
             setUnderlyingType( UNDERLYING_TYPE_EDEFAULT );
             return;
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
             unsetUnderlyingTypeKind();
             return;
         }
@@ -823,32 +823,32 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TSUB_DATA_OBJECT__IS_ARRAY:
+        case NsdPackage.SUB_DATA_OBJECT__IS_ARRAY:
             return isSetIsArray();
-        case NsdPackage.TSUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__MAX_INDEX_ATTRIBUTE:
             return MAX_INDEX_ATTRIBUTE_EDEFAULT == null ? maxIndexAttribute != null
                     : !MAX_INDEX_ATTRIBUTE_EDEFAULT.equals( maxIndexAttribute );
-        case NsdPackage.TSUB_DATA_OBJECT__MIN_INDEX:
+        case NsdPackage.SUB_DATA_OBJECT__MIN_INDEX:
             return isSetMinIndex();
-        case NsdPackage.TSUB_DATA_OBJECT__NAME:
+        case NsdPackage.SUB_DATA_OBJECT__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals( name );
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND:
             return isSetPresCond();
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS:
             return PRES_COND_ARGS_EDEFAULT == null ? presCondArgs != null
                     : !PRES_COND_ARGS_EDEFAULT.equals( presCondArgs );
-        case NsdPackage.TSUB_DATA_OBJECT__PRES_COND_ARGS_ID:
+        case NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS_ID:
             return PRES_COND_ARGS_ID_EDEFAULT == null ? presCondArgsID != null
                     : !PRES_COND_ARGS_ID_EDEFAULT.equals( presCondArgsID );
-        case NsdPackage.TSUB_DATA_OBJECT__SIZE_ATTRIBUTE:
+        case NsdPackage.SUB_DATA_OBJECT__SIZE_ATTRIBUTE:
             return SIZE_ATTRIBUTE_EDEFAULT == null ? sizeAttribute != null
                     : !SIZE_ATTRIBUTE_EDEFAULT.equals( sizeAttribute );
-        case NsdPackage.TSUB_DATA_OBJECT__TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__TYPE:
             return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals( type );
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE:
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE:
             return UNDERLYING_TYPE_EDEFAULT == null ? underlyingType != null
                     : !UNDERLYING_TYPE_EDEFAULT.equals( underlyingType );
-        case NsdPackage.TSUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
+        case NsdPackage.SUB_DATA_OBJECT__UNDERLYING_TYPE_KIND:
             return isSetUnderlyingTypeKind();
         }
         return super.eIsSet( featureID );
@@ -902,4 +902,4 @@ public class TSubDataObjectImpl extends TDocumentedClassImpl implements TSubData
         return result.toString();
     }
 
-} //TSubDataObjectImpl
+} //SubDataObjectImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TTitledClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java
similarity index 86%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TTitledClassImpl.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java
index 1a9b7e670414f3fdacf9be307f8212a83b337d8a..af444522c998905940f5d8e89b1b1e4237453496 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TTitledClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java
@@ -20,7 +20,7 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -30,18 +30,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TTitled Class</b></em>'.
+ * An implementation of the model object '<em><b>Titled Class</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TTitledClassImpl#getTitleID <em>Title ID</em>}</li>
+ *   <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl.TitledClassImpl#getTitleID <em>Title ID</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class TTitledClassImpl extends TDocumentedClassImpl implements TTitledClass {
+public class TitledClassImpl extends DocumentedClassImpl implements TitledClass {
     /**
      * The default value of the '{@link #getTitleID() <em>Title ID</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -67,7 +67,7 @@ public class TTitledClassImpl extends TDocumentedClassImpl implements TTitledCla
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TTitledClassImpl() {
+    protected TitledClassImpl() {
         super();
     }
 
@@ -78,7 +78,7 @@ public class TTitledClassImpl extends TDocumentedClassImpl implements TTitledCla
      */
     @Override
     protected EClass eStaticClass() {
-        return NsdPackage.Literals.TTITLED_CLASS;
+        return NsdPackage.Literals.TITLED_CLASS;
     }
 
     /**
@@ -101,7 +101,7 @@ public class TTitledClassImpl extends TDocumentedClassImpl implements TTitledCla
         String oldTitleID = titleID;
         titleID = newTitleID;
         if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET,
-                NsdPackage.TTITLED_CLASS__TITLE_ID, oldTitleID, titleID ) );
+                NsdPackage.TITLED_CLASS__TITLE_ID, oldTitleID, titleID ) );
     }
 
     /**
@@ -112,7 +112,7 @@ public class TTitledClassImpl extends TDocumentedClassImpl implements TTitledCla
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
         switch( featureID ) {
-        case NsdPackage.TTITLED_CLASS__TITLE_ID:
+        case NsdPackage.TITLED_CLASS__TITLE_ID:
             return getTitleID();
         }
         return super.eGet( featureID, resolve, coreType );
@@ -126,7 +126,7 @@ public class TTitledClassImpl extends TDocumentedClassImpl implements TTitledCla
     @Override
     public void eSet( int featureID, Object newValue ) {
         switch( featureID ) {
-        case NsdPackage.TTITLED_CLASS__TITLE_ID:
+        case NsdPackage.TITLED_CLASS__TITLE_ID:
             setTitleID( ( String ) newValue );
             return;
         }
@@ -141,7 +141,7 @@ public class TTitledClassImpl extends TDocumentedClassImpl implements TTitledCla
     @Override
     public void eUnset( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TTITLED_CLASS__TITLE_ID:
+        case NsdPackage.TITLED_CLASS__TITLE_ID:
             setTitleID( TITLE_ID_EDEFAULT );
             return;
         }
@@ -156,7 +156,7 @@ public class TTitledClassImpl extends TDocumentedClassImpl implements TTitledCla
     @Override
     public boolean eIsSet( int featureID ) {
         switch( featureID ) {
-        case NsdPackage.TTITLED_CLASS__TITLE_ID:
+        case NsdPackage.TITLED_CLASS__TITLE_ID:
             return TITLE_ID_EDEFAULT == null ? titleID != null : !TITLE_ID_EDEFAULT.equals( titleID );
         }
         return super.eIsSet( featureID );
@@ -178,4 +178,4 @@ public class TTitledClassImpl extends TDocumentedClassImpl implements TTitledCla
         return result.toString();
     }
 
-} //TTitledClassImpl
+} //TitledClassImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdAdapterFactory.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdAdapterFactory.java
index 8e4f8c9bc7df742da9eea808ab71548ce573c6e9..5ab53687ed2a3e4664692d3d9a7d8eacb9c5e130 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdAdapterFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdAdapterFactory.java
@@ -104,233 +104,238 @@ public class NsdAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseTAbbreviation( TAbbreviation object ) {
-            return createTAbbreviationAdapter();
+        public Adapter caseAbbreviation( Abbreviation object ) {
+            return createAbbreviationAdapter();
         }
 
         @Override
-        public Adapter caseTAbbreviations( TAbbreviations object ) {
-            return createTAbbreviationsAdapter();
+        public Adapter caseAbbreviations( Abbreviations object ) {
+            return createAbbreviationsAdapter();
         }
 
         @Override
-        public Adapter caseTAbstractLNClass( TAbstractLNClass object ) {
-            return createTAbstractLNClassAdapter();
+        public Adapter caseAbstractLNClass( AbstractLNClass object ) {
+            return createAbstractLNClassAdapter();
         }
 
         @Override
-        public Adapter caseTAnyLNClass( TAnyLNClass object ) {
-            return createTAnyLNClassAdapter();
+        public Adapter caseAnyLNClass( AnyLNClass object ) {
+            return createAnyLNClassAdapter();
         }
 
         @Override
-        public Adapter caseTApplicableServiceNS( TApplicableServiceNS object ) {
-            return createTApplicableServiceNSAdapter();
+        public Adapter caseApplicableServiceNS( ApplicableServiceNS object ) {
+            return createApplicableServiceNSAdapter();
         }
 
         @Override
-        public Adapter caseTApplicableServices( TApplicableServices object ) {
-            return createTApplicableServicesAdapter();
+        public Adapter caseApplicableServices( ApplicableServices object ) {
+            return createApplicableServicesAdapter();
         }
 
         @Override
-        public Adapter caseTBasicType( TBasicType object ) {
-            return createTBasicTypeAdapter();
+        public Adapter caseBasicType( BasicType object ) {
+            return createBasicTypeAdapter();
         }
 
         @Override
-        public Adapter caseTBasicTypes( TBasicTypes object ) {
-            return createTBasicTypesAdapter();
+        public Adapter caseBasicTypes( BasicTypes object ) {
+            return createBasicTypesAdapter();
         }
 
         @Override
-        public Adapter caseTCDC( TCDC object ) {
-            return createTCDCAdapter();
+        public Adapter caseCDC( CDC object ) {
+            return createCDCAdapter();
         }
 
         @Override
-        public Adapter caseTCDCs( TCDCs object ) {
-            return createTCDCsAdapter();
+        public Adapter caseCDCs( CDCs object ) {
+            return createCDCsAdapter();
         }
 
         @Override
-        public Adapter caseTChanges( TChanges object ) {
-            return createTChangesAdapter();
+        public Adapter caseChanges( Changes object ) {
+            return createChangesAdapter();
         }
 
         @Override
-        public Adapter caseTConstructedAttribute( TConstructedAttribute object ) {
-            return createTConstructedAttributeAdapter();
+        public Adapter caseConstructedAttribute( ConstructedAttribute object ) {
+            return createConstructedAttributeAdapter();
         }
 
         @Override
-        public Adapter caseTConstructedAttributes( TConstructedAttributes object ) {
-            return createTConstructedAttributesAdapter();
+        public Adapter caseConstructedAttributes( ConstructedAttributes object ) {
+            return createConstructedAttributesAdapter();
         }
 
         @Override
-        public Adapter caseTCopyrighted( TCopyrighted object ) {
-            return createTCopyrightedAdapter();
+        public Adapter caseCopyrighted( Copyrighted object ) {
+            return createCopyrightedAdapter();
         }
 
         @Override
-        public Adapter caseTCopyrightNotice( TCopyrightNotice object ) {
-            return createTCopyrightNoticeAdapter();
+        public Adapter caseCopyrightNotice( CopyrightNotice object ) {
+            return createCopyrightNoticeAdapter();
         }
 
         @Override
-        public Adapter caseTDataAttribute( TDataAttribute object ) {
-            return createTDataAttributeAdapter();
+        public Adapter caseDataAttribute( DataAttribute object ) {
+            return createDataAttributeAdapter();
         }
 
         @Override
-        public Adapter caseTDataObject( TDataObject object ) {
-            return createTDataObjectAdapter();
+        public Adapter caseDataObject( DataObject object ) {
+            return createDataObjectAdapter();
         }
 
         @Override
-        public Adapter caseTDataSetMemberOf( TDataSetMemberOf object ) {
-            return createTDataSetMemberOfAdapter();
+        public Adapter caseDataSetMemberOf( DataSetMemberOf object ) {
+            return createDataSetMemberOfAdapter();
         }
 
         @Override
-        public Adapter caseTDoc( TDoc object ) {
-            return createTDocAdapter();
+        public Adapter caseDoc( Doc object ) {
+            return createDocAdapter();
         }
 
         @Override
-        public Adapter caseTDocumentedClass( TDocumentedClass object ) {
-            return createTDocumentedClassAdapter();
+        public Adapter caseDocumentedClass( DocumentedClass object ) {
+            return createDocumentedClassAdapter();
         }
 
         @Override
-        public Adapter caseTEnumeration( TEnumeration object ) {
-            return createTEnumerationAdapter();
+        public Adapter caseEnumeration( Enumeration object ) {
+            return createEnumerationAdapter();
         }
 
         @Override
-        public Adapter caseTEnumerations( TEnumerations object ) {
-            return createTEnumerationsAdapter();
+        public Adapter caseEnumerations( Enumerations object ) {
+            return createEnumerationsAdapter();
         }
 
         @Override
-        public Adapter caseTFunctionalConstraint( TFunctionalConstraint object ) {
-            return createTFunctionalConstraintAdapter();
+        public Adapter caseFunctionalConstraint( FunctionalConstraint object ) {
+            return createFunctionalConstraintAdapter();
         }
 
         @Override
-        public Adapter caseTFunctionalConstraints( TFunctionalConstraints object ) {
-            return createTFunctionalConstraintsAdapter();
+        public Adapter caseFunctionalConstraints( FunctionalConstraints object ) {
+            return createFunctionalConstraintsAdapter();
         }
 
         @Override
-        public Adapter caseTLicense( TLicense object ) {
-            return createTLicenseAdapter();
+        public Adapter caseLicense( License object ) {
+            return createLicenseAdapter();
         }
 
         @Override
-        public Adapter caseTLiteral( TLiteral object ) {
-            return createTLiteralAdapter();
+        public Adapter caseLiteral( Literal object ) {
+            return createLiteralAdapter();
         }
 
         @Override
-        public Adapter caseTLNClass( TLNClass object ) {
-            return createTLNClassAdapter();
+        public Adapter caseLNClass( LNClass object ) {
+            return createLNClassAdapter();
         }
 
         @Override
-        public Adapter caseTLNClasses( TLNClasses object ) {
-            return createTLNClassesAdapter();
+        public Adapter caseLNClasses( LNClasses object ) {
+            return createLNClassesAdapter();
         }
 
         @Override
-        public Adapter caseTNotice( TNotice object ) {
-            return createTNoticeAdapter();
+        public Adapter caseNotice( Notice object ) {
+            return createNoticeAdapter();
         }
 
         @Override
-        public Adapter caseTNS( TNS object ) {
-            return createTNSAdapter();
+        public Adapter caseNS( NS object ) {
+            return createNSAdapter();
         }
 
         @Override
-        public Adapter caseTNSDoc( TNSDoc object ) {
-            return createTNSDocAdapter();
+        public Adapter caseNSDoc( NSDoc object ) {
+            return createNSDocAdapter();
         }
 
         @Override
-        public Adapter caseTPresenceCondition( TPresenceCondition object ) {
-            return createTPresenceConditionAdapter();
+        public Adapter casePresenceCondition( PresenceCondition object ) {
+            return createPresenceConditionAdapter();
         }
 
         @Override
-        public Adapter caseTPresenceConditions( TPresenceConditions object ) {
-            return createTPresenceConditionsAdapter();
+        public Adapter casePresenceConditions( PresenceConditions object ) {
+            return createPresenceConditionsAdapter();
         }
 
         @Override
-        public Adapter caseTServiceCDC( TServiceCDC object ) {
-            return createTServiceCDCAdapter();
+        public Adapter caseServiceCDC( ServiceCDC object ) {
+            return createServiceCDCAdapter();
         }
 
         @Override
-        public Adapter caseTServiceCDCs( TServiceCDCs object ) {
-            return createTServiceCDCsAdapter();
+        public Adapter caseServiceCDCs( ServiceCDCs object ) {
+            return createServiceCDCsAdapter();
         }
 
         @Override
-        public Adapter caseTServiceConstructedAttribute( TServiceConstructedAttribute object ) {
-            return createTServiceConstructedAttributeAdapter();
+        public Adapter caseServiceConstructedAttribute( ServiceConstructedAttribute object ) {
+            return createServiceConstructedAttributeAdapter();
         }
 
         @Override
-        public Adapter caseTServiceConstructedAttributes( TServiceConstructedAttributes object ) {
-            return createTServiceConstructedAttributesAdapter();
+        public Adapter caseServiceConstructedAttributes( ServiceConstructedAttributes object ) {
+            return createServiceConstructedAttributesAdapter();
         }
 
         @Override
-        public Adapter caseTServiceDataAttribute( TServiceDataAttribute object ) {
-            return createTServiceDataAttributeAdapter();
+        public Adapter caseServiceDataAttribute( ServiceDataAttribute object ) {
+            return createServiceDataAttributeAdapter();
         }
 
         @Override
-        public Adapter caseTServiceNS( TServiceNS object ) {
-            return createTServiceNSAdapter();
+        public Adapter caseServiceNS( ServiceNS object ) {
+            return createServiceNSAdapter();
         }
 
         @Override
-        public Adapter caseTServiceNsUsage( TServiceNsUsage object ) {
-            return createTServiceNsUsageAdapter();
+        public Adapter caseServiceNsUsage( ServiceNsUsage object ) {
+            return createServiceNsUsageAdapter();
         }
 
         @Override
-        public Adapter caseTServiceParameter( TServiceParameter object ) {
-            return createTServiceParameterAdapter();
+        public Adapter caseServiceParameter( ServiceParameter object ) {
+            return createServiceParameterAdapter();
         }
 
         @Override
-        public Adapter caseTServiceTypeRealization( TServiceTypeRealization object ) {
-            return createTServiceTypeRealizationAdapter();
+        public Adapter caseServiceTypeRealization( ServiceTypeRealization object ) {
+            return createServiceTypeRealizationAdapter();
         }
 
         @Override
-        public Adapter caseTServiceTypeRealizations( TServiceTypeRealizations object ) {
-            return createTServiceTypeRealizationsAdapter();
+        public Adapter caseServiceTypeRealizations( ServiceTypeRealizations object ) {
+            return createServiceTypeRealizationsAdapter();
         }
 
         @Override
-        public Adapter caseTSubDataAttribute( TSubDataAttribute object ) {
-            return createTSubDataAttributeAdapter();
+        public Adapter caseSubDataAttribute( SubDataAttribute object ) {
+            return createSubDataAttributeAdapter();
         }
 
         @Override
-        public Adapter caseTSubDataObject( TSubDataObject object ) {
-            return createTSubDataObjectAdapter();
+        public Adapter caseSubDataObject( SubDataObject object ) {
+            return createSubDataObjectAdapter();
         }
 
         @Override
-        public Adapter caseTTitledClass( TTitledClass object ) {
-            return createTTitledClassAdapter();
+        public Adapter caseTitledClass( TitledClass object ) {
+            return createTitledClassAdapter();
+        }
+
+        @Override
+        public Adapter caseNSDObjectWithVersionAndRelease( NSDObjectWithVersionAndRelease object ) {
+            return createNSDObjectWithVersionAndReleaseAdapter();
         }
 
         @Override
@@ -409,646 +414,660 @@ public class NsdAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation <em>TAbbreviation</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation <em>Abbreviation</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation
+     * @generated
+     */
+    public Adapter createAbbreviationAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations <em>Abbreviations</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviation
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations
      * @generated
      */
-    public Adapter createTAbbreviationAdapter() {
+    public Adapter createAbbreviationsAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations <em>TAbbreviations</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass <em>Abstract LN Class</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbbreviations
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass
      * @generated
      */
-    public Adapter createTAbbreviationsAdapter() {
+    public Adapter createAbstractLNClassAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass <em>TAbstract LN Class</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass <em>Any LN Class</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAbstractLNClass
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass
      * @generated
      */
-    public Adapter createTAbstractLNClassAdapter() {
+    public Adapter createAnyLNClassAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass <em>TAny LN Class</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS <em>Applicable Service NS</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TAnyLNClass
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS
      * @generated
      */
-    public Adapter createTAnyLNClassAdapter() {
+    public Adapter createApplicableServiceNSAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS <em>TApplicable Service NS</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices <em>Applicable Services</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServiceNS
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServices
      * @generated
      */
-    public Adapter createTApplicableServiceNSAdapter() {
+    public Adapter createApplicableServicesAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices <em>TApplicable Services</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType <em>Basic Type</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TApplicableServices
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType
      * @generated
      */
-    public Adapter createTApplicableServicesAdapter() {
+    public Adapter createBasicTypeAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType <em>TBasic Type</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes <em>Basic Types</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicType
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes
      * @generated
      */
-    public Adapter createTBasicTypeAdapter() {
+    public Adapter createBasicTypesAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes <em>TBasic Types</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC <em>CDC</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TBasicTypes
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC
      * @generated
      */
-    public Adapter createTBasicTypesAdapter() {
+    public Adapter createCDCAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC <em>TCDC</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs <em>CD Cs</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDC
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDCs
      * @generated
      */
-    public Adapter createTCDCAdapter() {
+    public Adapter createCDCsAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs <em>TCD Cs</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes <em>Changes</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCDCs
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Changes
      * @generated
      */
-    public Adapter createTCDCsAdapter() {
+    public Adapter createChangesAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges <em>TChanges</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute <em>Constructed Attribute</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TChanges
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute
      * @generated
      */
-    public Adapter createTChangesAdapter() {
+    public Adapter createConstructedAttributeAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute <em>TConstructed Attribute</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes <em>Constructed Attributes</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttribute
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes
      * @generated
      */
-    public Adapter createTConstructedAttributeAdapter() {
+    public Adapter createConstructedAttributesAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes <em>TConstructed Attributes</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted <em>Copyrighted</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TConstructedAttributes
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Copyrighted
      * @generated
      */
-    public Adapter createTConstructedAttributesAdapter() {
+    public Adapter createCopyrightedAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted <em>TCopyrighted</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice <em>Copyright Notice</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrighted
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.CopyrightNotice
      * @generated
      */
-    public Adapter createTCopyrightedAdapter() {
+    public Adapter createCopyrightNoticeAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice <em>TCopyright Notice</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute <em>Data Attribute</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TCopyrightNotice
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute
      * @generated
      */
-    public Adapter createTCopyrightNoticeAdapter() {
+    public Adapter createDataAttributeAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute <em>TData Attribute</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject <em>Data Object</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataAttribute
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject
      * @generated
      */
-    public Adapter createTDataAttributeAdapter() {
+    public Adapter createDataObjectAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject <em>TData Object</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf <em>Data Set Member Of</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataObject
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataSetMemberOf
      * @generated
      */
-    public Adapter createTDataObjectAdapter() {
+    public Adapter createDataSetMemberOfAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf <em>TData Set Member Of</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc <em>Doc</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDataSetMemberOf
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc
      * @generated
      */
-    public Adapter createTDataSetMemberOfAdapter() {
+    public Adapter createDocAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc <em>TDoc</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass <em>Documented Class</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDoc
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass
      * @generated
      */
-    public Adapter createTDocAdapter() {
+    public Adapter createDocumentedClassAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass <em>TDocumented Class</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration <em>Enumeration</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TDocumentedClass
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration
      * @generated
      */
-    public Adapter createTDocumentedClassAdapter() {
+    public Adapter createEnumerationAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration <em>TEnumeration</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations <em>Enumerations</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumeration
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations
      * @generated
      */
-    public Adapter createTEnumerationAdapter() {
+    public Adapter createEnumerationsAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations <em>TEnumerations</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint <em>Functional Constraint</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TEnumerations
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint
      * @generated
      */
-    public Adapter createTEnumerationsAdapter() {
+    public Adapter createFunctionalConstraintAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint <em>TFunctional Constraint</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints <em>Functional Constraints</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraint
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints
      * @generated
      */
-    public Adapter createTFunctionalConstraintAdapter() {
+    public Adapter createFunctionalConstraintsAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints <em>TFunctional Constraints</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.License <em>License</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TFunctionalConstraints
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.License
      * @generated
      */
-    public Adapter createTFunctionalConstraintsAdapter() {
+    public Adapter createLicenseAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense <em>TLicense</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal <em>Literal</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLicense
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal
      * @generated
      */
-    public Adapter createTLicenseAdapter() {
+    public Adapter createLiteralAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral <em>TLiteral</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass <em>LN Class</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLiteral
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass
      * @generated
      */
-    public Adapter createTLiteralAdapter() {
+    public Adapter createLNClassAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass <em>TLN Class</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses <em>LN Classes</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClass
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses
      * @generated
      */
-    public Adapter createTLNClassAdapter() {
+    public Adapter createLNClassesAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses <em>TLN Classes</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice <em>Notice</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TLNClasses
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Notice
      * @generated
      */
-    public Adapter createTLNClassesAdapter() {
+    public Adapter createNoticeAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice <em>TNotice</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS <em>NS</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNotice
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS
      * @generated
      */
-    public Adapter createTNoticeAdapter() {
+    public Adapter createNSAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS <em>TNS</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc <em>NS Doc</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNS
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc
      * @generated
      */
-    public Adapter createTNSAdapter() {
+    public Adapter createNSDocAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc <em>TNS Doc</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition <em>Presence Condition</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TNSDoc
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition
      * @generated
      */
-    public Adapter createTNSDocAdapter() {
+    public Adapter createPresenceConditionAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition <em>TPresence Condition</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions <em>Presence Conditions</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceCondition
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions
      * @generated
      */
-    public Adapter createTPresenceConditionAdapter() {
+    public Adapter createPresenceConditionsAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions <em>TPresence Conditions</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC <em>Service CDC</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TPresenceConditions
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC
      * @generated
      */
-    public Adapter createTPresenceConditionsAdapter() {
+    public Adapter createServiceCDCAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC <em>TService CDC</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs <em>Service CD Cs</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDC
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs
      * @generated
      */
-    public Adapter createTServiceCDCAdapter() {
+    public Adapter createServiceCDCsAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs <em>TService CD Cs</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute <em>Service Constructed Attribute</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceCDCs
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttribute
      * @generated
      */
-    public Adapter createTServiceCDCsAdapter() {
+    public Adapter createServiceConstructedAttributeAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute <em>TService Constructed Attribute</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes <em>Service Constructed Attributes</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttribute
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes
      * @generated
      */
-    public Adapter createTServiceConstructedAttributeAdapter() {
+    public Adapter createServiceConstructedAttributesAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes <em>TService Constructed Attributes</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute <em>Service Data Attribute</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceConstructedAttributes
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute
      * @generated
      */
-    public Adapter createTServiceConstructedAttributesAdapter() {
+    public Adapter createServiceDataAttributeAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute <em>TService Data Attribute</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS <em>Service NS</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceDataAttribute
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS
      * @generated
      */
-    public Adapter createTServiceDataAttributeAdapter() {
+    public Adapter createServiceNSAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS <em>TService NS</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage <em>Service Ns Usage</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNS
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNsUsage
      * @generated
      */
-    public Adapter createTServiceNSAdapter() {
+    public Adapter createServiceNsUsageAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage <em>TService Ns Usage</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter <em>Service Parameter</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceNsUsage
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter
      * @generated
      */
-    public Adapter createTServiceNsUsageAdapter() {
+    public Adapter createServiceParameterAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter <em>TService Parameter</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization <em>Service Type Realization</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceParameter
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealization
      * @generated
      */
-    public Adapter createTServiceParameterAdapter() {
+    public Adapter createServiceTypeRealizationAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization <em>TService Type Realization</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations <em>Service Type Realizations</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealization
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations
      * @generated
      */
-    public Adapter createTServiceTypeRealizationAdapter() {
+    public Adapter createServiceTypeRealizationsAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations <em>TService Type Realizations</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute <em>Sub Data Attribute</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TServiceTypeRealizations
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute
      * @generated
      */
-    public Adapter createTServiceTypeRealizationsAdapter() {
+    public Adapter createSubDataAttributeAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute <em>TSub Data Attribute</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject <em>Sub Data Object</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataAttribute
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject
      * @generated
      */
-    public Adapter createTSubDataAttributeAdapter() {
+    public Adapter createSubDataObjectAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject <em>TSub Data Object</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass <em>Titled Class</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TSubDataObject
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass
      * @generated
      */
-    public Adapter createTSubDataObjectAdapter() {
+    public Adapter createTitledClassAdapter() {
         return null;
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass <em>TTitled Class</em>}'.
+     * Creates a new adapter for an object of class '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease <em>NSD Object With Version And Release</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TTitledClass
+     * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDObjectWithVersionAndRelease
      * @generated
      */
-    public Adapter createTTitledClassAdapter() {
+    public Adapter createNSDObjectWithVersionAndReleaseAdapter() {
         return null;
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdSwitch.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdSwitch.java
index e99592b1f4046b82b00dbd383aa5f32192b2285e..1d6b61ddeaf37847131338e5b5786deffe30211d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdSwitch.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdSwitch.java
@@ -86,12 +86,14 @@ public class NsdSwitch< T > extends Switch< T > {
         case NsdPackage.APPLIES_TO_TYPE: {
             AppliesToType appliesToType = ( AppliesToType ) theEObject;
             T result = caseAppliesToType( appliesToType );
+            if( result == null ) result = caseNSDObjectWithVersionAndRelease( appliesToType );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
         case NsdPackage.DEPENDS_ON_TYPE: {
             DependsOnType dependsOnType = ( DependsOnType ) theEObject;
             T result = caseDependsOnType( dependsOnType );
+            if( result == null ) result = caseNSDObjectWithVersionAndRelease( dependsOnType );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
@@ -107,308 +109,319 @@ public class NsdSwitch< T > extends Switch< T > {
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TABBREVIATION: {
-            TAbbreviation tAbbreviation = ( TAbbreviation ) theEObject;
-            T result = caseTAbbreviation( tAbbreviation );
+        case NsdPackage.ABBREVIATION: {
+            Abbreviation abbreviation = ( Abbreviation ) theEObject;
+            T result = caseAbbreviation( abbreviation );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TABBREVIATIONS: {
-            TAbbreviations tAbbreviations = ( TAbbreviations ) theEObject;
-            T result = caseTAbbreviations( tAbbreviations );
+        case NsdPackage.ABBREVIATIONS: {
+            Abbreviations abbreviations = ( Abbreviations ) theEObject;
+            T result = caseAbbreviations( abbreviations );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TABSTRACT_LN_CLASS: {
-            TAbstractLNClass tAbstractLNClass = ( TAbstractLNClass ) theEObject;
-            T result = caseTAbstractLNClass( tAbstractLNClass );
-            if( result == null ) result = caseTAnyLNClass( tAbstractLNClass );
-            if( result == null ) result = caseTTitledClass( tAbstractLNClass );
-            if( result == null ) result = caseTDocumentedClass( tAbstractLNClass );
+        case NsdPackage.ABSTRACT_LN_CLASS: {
+            AbstractLNClass abstractLNClass = ( AbstractLNClass ) theEObject;
+            T result = caseAbstractLNClass( abstractLNClass );
+            if( result == null ) result = caseAnyLNClass( abstractLNClass );
+            if( result == null ) result = caseTitledClass( abstractLNClass );
+            if( result == null ) result = caseDocumentedClass( abstractLNClass );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TANY_LN_CLASS: {
-            TAnyLNClass tAnyLNClass = ( TAnyLNClass ) theEObject;
-            T result = caseTAnyLNClass( tAnyLNClass );
-            if( result == null ) result = caseTTitledClass( tAnyLNClass );
-            if( result == null ) result = caseTDocumentedClass( tAnyLNClass );
+        case NsdPackage.ANY_LN_CLASS: {
+            AnyLNClass anyLNClass = ( AnyLNClass ) theEObject;
+            T result = caseAnyLNClass( anyLNClass );
+            if( result == null ) result = caseTitledClass( anyLNClass );
+            if( result == null ) result = caseDocumentedClass( anyLNClass );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TAPPLICABLE_SERVICE_NS: {
-            TApplicableServiceNS tApplicableServiceNS = ( TApplicableServiceNS ) theEObject;
-            T result = caseTApplicableServiceNS( tApplicableServiceNS );
-            if( result == null ) result = caseTCopyrighted( tApplicableServiceNS );
+        case NsdPackage.APPLICABLE_SERVICE_NS: {
+            ApplicableServiceNS applicableServiceNS = ( ApplicableServiceNS ) theEObject;
+            T result = caseApplicableServiceNS( applicableServiceNS );
+            if( result == null ) result = caseCopyrighted( applicableServiceNS );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TAPPLICABLE_SERVICES: {
-            TApplicableServices tApplicableServices = ( TApplicableServices ) theEObject;
-            T result = caseTApplicableServices( tApplicableServices );
+        case NsdPackage.APPLICABLE_SERVICES: {
+            ApplicableServices applicableServices = ( ApplicableServices ) theEObject;
+            T result = caseApplicableServices( applicableServices );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TBASIC_TYPE: {
-            TBasicType tBasicType = ( TBasicType ) theEObject;
-            T result = caseTBasicType( tBasicType );
+        case NsdPackage.BASIC_TYPE: {
+            BasicType basicType = ( BasicType ) theEObject;
+            T result = caseBasicType( basicType );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TBASIC_TYPES: {
-            TBasicTypes tBasicTypes = ( TBasicTypes ) theEObject;
-            T result = caseTBasicTypes( tBasicTypes );
+        case NsdPackage.BASIC_TYPES: {
+            BasicTypes basicTypes = ( BasicTypes ) theEObject;
+            T result = caseBasicTypes( basicTypes );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TCDC: {
-            TCDC tcdc = ( TCDC ) theEObject;
-            T result = caseTCDC( tcdc );
-            if( result == null ) result = caseTTitledClass( tcdc );
-            if( result == null ) result = caseTDocumentedClass( tcdc );
+        case NsdPackage.CDC: {
+            CDC cdc = ( CDC ) theEObject;
+            T result = caseCDC( cdc );
+            if( result == null ) result = caseTitledClass( cdc );
+            if( result == null ) result = caseDocumentedClass( cdc );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TCD_CS: {
-            TCDCs tcdCs = ( TCDCs ) theEObject;
-            T result = caseTCDCs( tcdCs );
+        case NsdPackage.CD_CS: {
+            CDCs cdCs = ( CDCs ) theEObject;
+            T result = caseCDCs( cdCs );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TCHANGES: {
-            TChanges tChanges = ( TChanges ) theEObject;
-            T result = caseTChanges( tChanges );
+        case NsdPackage.CHANGES: {
+            Changes changes = ( Changes ) theEObject;
+            T result = caseChanges( changes );
+            if( result == null ) result = caseNSDObjectWithVersionAndRelease( changes );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE: {
-            TConstructedAttribute tConstructedAttribute = ( TConstructedAttribute ) theEObject;
-            T result = caseTConstructedAttribute( tConstructedAttribute );
-            if( result == null ) result = caseTTitledClass( tConstructedAttribute );
-            if( result == null ) result = caseTDocumentedClass( tConstructedAttribute );
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE: {
+            ConstructedAttribute constructedAttribute = ( ConstructedAttribute ) theEObject;
+            T result = caseConstructedAttribute( constructedAttribute );
+            if( result == null ) result = caseTitledClass( constructedAttribute );
+            if( result == null ) result = caseDocumentedClass( constructedAttribute );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTES: {
-            TConstructedAttributes tConstructedAttributes = ( TConstructedAttributes ) theEObject;
-            T result = caseTConstructedAttributes( tConstructedAttributes );
+        case NsdPackage.CONSTRUCTED_ATTRIBUTES: {
+            ConstructedAttributes constructedAttributes = ( ConstructedAttributes ) theEObject;
+            T result = caseConstructedAttributes( constructedAttributes );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TCOPYRIGHTED: {
-            TCopyrighted tCopyrighted = ( TCopyrighted ) theEObject;
-            T result = caseTCopyrighted( tCopyrighted );
+        case NsdPackage.COPYRIGHTED: {
+            Copyrighted copyrighted = ( Copyrighted ) theEObject;
+            T result = caseCopyrighted( copyrighted );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TCOPYRIGHT_NOTICE: {
-            TCopyrightNotice tCopyrightNotice = ( TCopyrightNotice ) theEObject;
-            T result = caseTCopyrightNotice( tCopyrightNotice );
+        case NsdPackage.COPYRIGHT_NOTICE: {
+            CopyrightNotice copyrightNotice = ( CopyrightNotice ) theEObject;
+            T result = caseCopyrightNotice( copyrightNotice );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TDATA_ATTRIBUTE: {
-            TDataAttribute tDataAttribute = ( TDataAttribute ) theEObject;
-            T result = caseTDataAttribute( tDataAttribute );
-            if( result == null ) result = caseTDocumentedClass( tDataAttribute );
+        case NsdPackage.DATA_ATTRIBUTE: {
+            DataAttribute dataAttribute = ( DataAttribute ) theEObject;
+            T result = caseDataAttribute( dataAttribute );
+            if( result == null ) result = caseDocumentedClass( dataAttribute );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TDATA_OBJECT: {
-            TDataObject tDataObject = ( TDataObject ) theEObject;
-            T result = caseTDataObject( tDataObject );
-            if( result == null ) result = caseTDocumentedClass( tDataObject );
+        case NsdPackage.DATA_OBJECT: {
+            DataObject dataObject = ( DataObject ) theEObject;
+            T result = caseDataObject( dataObject );
+            if( result == null ) result = caseDocumentedClass( dataObject );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TDATA_SET_MEMBER_OF: {
-            TDataSetMemberOf tDataSetMemberOf = ( TDataSetMemberOf ) theEObject;
-            T result = caseTDataSetMemberOf( tDataSetMemberOf );
+        case NsdPackage.DATA_SET_MEMBER_OF: {
+            DataSetMemberOf dataSetMemberOf = ( DataSetMemberOf ) theEObject;
+            T result = caseDataSetMemberOf( dataSetMemberOf );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TDOC: {
-            TDoc tDoc = ( TDoc ) theEObject;
-            T result = caseTDoc( tDoc );
+        case NsdPackage.DOC: {
+            Doc doc = ( Doc ) theEObject;
+            T result = caseDoc( doc );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TDOCUMENTED_CLASS: {
-            TDocumentedClass tDocumentedClass = ( TDocumentedClass ) theEObject;
-            T result = caseTDocumentedClass( tDocumentedClass );
+        case NsdPackage.DOCUMENTED_CLASS: {
+            DocumentedClass documentedClass = ( DocumentedClass ) theEObject;
+            T result = caseDocumentedClass( documentedClass );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TENUMERATION: {
-            TEnumeration tEnumeration = ( TEnumeration ) theEObject;
-            T result = caseTEnumeration( tEnumeration );
-            if( result == null ) result = caseTTitledClass( tEnumeration );
-            if( result == null ) result = caseTDocumentedClass( tEnumeration );
+        case NsdPackage.ENUMERATION: {
+            Enumeration enumeration = ( Enumeration ) theEObject;
+            T result = caseEnumeration( enumeration );
+            if( result == null ) result = caseTitledClass( enumeration );
+            if( result == null ) result = caseDocumentedClass( enumeration );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TENUMERATIONS: {
-            TEnumerations tEnumerations = ( TEnumerations ) theEObject;
-            T result = caseTEnumerations( tEnumerations );
+        case NsdPackage.ENUMERATIONS: {
+            Enumerations enumerations = ( Enumerations ) theEObject;
+            T result = caseEnumerations( enumerations );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT: {
-            TFunctionalConstraint tFunctionalConstraint = ( TFunctionalConstraint ) theEObject;
-            T result = caseTFunctionalConstraint( tFunctionalConstraint );
+        case NsdPackage.FUNCTIONAL_CONSTRAINT: {
+            FunctionalConstraint functionalConstraint = ( FunctionalConstraint ) theEObject;
+            T result = caseFunctionalConstraint( functionalConstraint );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TFUNCTIONAL_CONSTRAINTS: {
-            TFunctionalConstraints tFunctionalConstraints = ( TFunctionalConstraints ) theEObject;
-            T result = caseTFunctionalConstraints( tFunctionalConstraints );
+        case NsdPackage.FUNCTIONAL_CONSTRAINTS: {
+            FunctionalConstraints functionalConstraints = ( FunctionalConstraints ) theEObject;
+            T result = caseFunctionalConstraints( functionalConstraints );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TLICENSE: {
-            TLicense tLicense = ( TLicense ) theEObject;
-            T result = caseTLicense( tLicense );
+        case NsdPackage.LICENSE: {
+            License license = ( License ) theEObject;
+            T result = caseLicense( license );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TLITERAL: {
-            TLiteral tLiteral = ( TLiteral ) theEObject;
-            T result = caseTLiteral( tLiteral );
-            if( result == null ) result = caseTDocumentedClass( tLiteral );
+        case NsdPackage.LITERAL: {
+            Literal literal = ( Literal ) theEObject;
+            T result = caseLiteral( literal );
+            if( result == null ) result = caseDocumentedClass( literal );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TLN_CLASS: {
-            TLNClass tlnClass = ( TLNClass ) theEObject;
-            T result = caseTLNClass( tlnClass );
-            if( result == null ) result = caseTAnyLNClass( tlnClass );
-            if( result == null ) result = caseTTitledClass( tlnClass );
-            if( result == null ) result = caseTDocumentedClass( tlnClass );
+        case NsdPackage.LN_CLASS: {
+            LNClass lnClass = ( LNClass ) theEObject;
+            T result = caseLNClass( lnClass );
+            if( result == null ) result = caseAnyLNClass( lnClass );
+            if( result == null ) result = caseTitledClass( lnClass );
+            if( result == null ) result = caseDocumentedClass( lnClass );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TLN_CLASSES: {
-            TLNClasses tlnClasses = ( TLNClasses ) theEObject;
-            T result = caseTLNClasses( tlnClasses );
+        case NsdPackage.LN_CLASSES: {
+            LNClasses lnClasses = ( LNClasses ) theEObject;
+            T result = caseLNClasses( lnClasses );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TNOTICE: {
-            TNotice tNotice = ( TNotice ) theEObject;
-            T result = caseTNotice( tNotice );
+        case NsdPackage.NOTICE: {
+            Notice notice = ( Notice ) theEObject;
+            T result = caseNotice( notice );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TNS: {
-            TNS tns = ( TNS ) theEObject;
-            T result = caseTNS( tns );
-            if( result == null ) result = caseTCopyrighted( tns );
+        case NsdPackage.NS: {
+            NS ns = ( NS ) theEObject;
+            T result = caseNS( ns );
+            if( result == null ) result = caseCopyrighted( ns );
+            if( result == null ) result = caseNSDObjectWithVersionAndRelease( ns );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TNS_DOC: {
-            TNSDoc tnsDoc = ( TNSDoc ) theEObject;
-            T result = caseTNSDoc( tnsDoc );
-            if( result == null ) result = caseTCopyrighted( tnsDoc );
+        case NsdPackage.NS_DOC: {
+            NSDoc nsDoc = ( NSDoc ) theEObject;
+            T result = caseNSDoc( nsDoc );
+            if( result == null ) result = caseCopyrighted( nsDoc );
+            if( result == null ) result = caseNSDObjectWithVersionAndRelease( nsDoc );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TPRESENCE_CONDITION: {
-            TPresenceCondition tPresenceCondition = ( TPresenceCondition ) theEObject;
-            T result = caseTPresenceCondition( tPresenceCondition );
+        case NsdPackage.PRESENCE_CONDITION: {
+            PresenceCondition presenceCondition = ( PresenceCondition ) theEObject;
+            T result = casePresenceCondition( presenceCondition );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TPRESENCE_CONDITIONS: {
-            TPresenceConditions tPresenceConditions = ( TPresenceConditions ) theEObject;
-            T result = caseTPresenceConditions( tPresenceConditions );
+        case NsdPackage.PRESENCE_CONDITIONS: {
+            PresenceConditions presenceConditions = ( PresenceConditions ) theEObject;
+            T result = casePresenceConditions( presenceConditions );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_CDC: {
-            TServiceCDC tServiceCDC = ( TServiceCDC ) theEObject;
-            T result = caseTServiceCDC( tServiceCDC );
+        case NsdPackage.SERVICE_CDC: {
+            ServiceCDC serviceCDC = ( ServiceCDC ) theEObject;
+            T result = caseServiceCDC( serviceCDC );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_CD_CS: {
-            TServiceCDCs tServiceCDCs = ( TServiceCDCs ) theEObject;
-            T result = caseTServiceCDCs( tServiceCDCs );
+        case NsdPackage.SERVICE_CD_CS: {
+            ServiceCDCs serviceCDCs = ( ServiceCDCs ) theEObject;
+            T result = caseServiceCDCs( serviceCDCs );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE: {
-            TServiceConstructedAttribute tServiceConstructedAttribute = ( TServiceConstructedAttribute ) theEObject;
-            T result = caseTServiceConstructedAttribute( tServiceConstructedAttribute );
-            if( result == null ) result = caseTConstructedAttribute( tServiceConstructedAttribute );
-            if( result == null ) result = caseTTitledClass( tServiceConstructedAttribute );
-            if( result == null ) result = caseTDocumentedClass( tServiceConstructedAttribute );
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE: {
+            ServiceConstructedAttribute serviceConstructedAttribute = ( ServiceConstructedAttribute ) theEObject;
+            T result = caseServiceConstructedAttribute( serviceConstructedAttribute );
+            if( result == null ) result = caseConstructedAttribute( serviceConstructedAttribute );
+            if( result == null ) result = caseTitledClass( serviceConstructedAttribute );
+            if( result == null ) result = caseDocumentedClass( serviceConstructedAttribute );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES: {
-            TServiceConstructedAttributes tServiceConstructedAttributes = ( TServiceConstructedAttributes ) theEObject;
-            T result = caseTServiceConstructedAttributes( tServiceConstructedAttributes );
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES: {
+            ServiceConstructedAttributes serviceConstructedAttributes = ( ServiceConstructedAttributes ) theEObject;
+            T result = caseServiceConstructedAttributes( serviceConstructedAttributes );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE: {
-            TServiceDataAttribute tServiceDataAttribute = ( TServiceDataAttribute ) theEObject;
-            T result = caseTServiceDataAttribute( tServiceDataAttribute );
-            if( result == null ) result = caseTDocumentedClass( tServiceDataAttribute );
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE: {
+            ServiceDataAttribute serviceDataAttribute = ( ServiceDataAttribute ) theEObject;
+            T result = caseServiceDataAttribute( serviceDataAttribute );
+            if( result == null ) result = caseDocumentedClass( serviceDataAttribute );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_NS: {
-            TServiceNS tServiceNS = ( TServiceNS ) theEObject;
-            T result = caseTServiceNS( tServiceNS );
-            if( result == null ) result = caseTCopyrighted( tServiceNS );
+        case NsdPackage.SERVICE_NS: {
+            ServiceNS serviceNS = ( ServiceNS ) theEObject;
+            T result = caseServiceNS( serviceNS );
+            if( result == null ) result = caseCopyrighted( serviceNS );
+            if( result == null ) result = caseNSDObjectWithVersionAndRelease( serviceNS );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_NS_USAGE: {
-            TServiceNsUsage tServiceNsUsage = ( TServiceNsUsage ) theEObject;
-            T result = caseTServiceNsUsage( tServiceNsUsage );
+        case NsdPackage.SERVICE_NS_USAGE: {
+            ServiceNsUsage serviceNsUsage = ( ServiceNsUsage ) theEObject;
+            T result = caseServiceNsUsage( serviceNsUsage );
+            if( result == null ) result = caseNSDObjectWithVersionAndRelease( serviceNsUsage );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_PARAMETER: {
-            TServiceParameter tServiceParameter = ( TServiceParameter ) theEObject;
-            T result = caseTServiceParameter( tServiceParameter );
-            if( result == null ) result = caseTDocumentedClass( tServiceParameter );
+        case NsdPackage.SERVICE_PARAMETER: {
+            ServiceParameter serviceParameter = ( ServiceParameter ) theEObject;
+            T result = caseServiceParameter( serviceParameter );
+            if( result == null ) result = caseDocumentedClass( serviceParameter );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_TYPE_REALIZATION: {
-            TServiceTypeRealization tServiceTypeRealization = ( TServiceTypeRealization ) theEObject;
-            T result = caseTServiceTypeRealization( tServiceTypeRealization );
+        case NsdPackage.SERVICE_TYPE_REALIZATION: {
+            ServiceTypeRealization serviceTypeRealization = ( ServiceTypeRealization ) theEObject;
+            T result = caseServiceTypeRealization( serviceTypeRealization );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSERVICE_TYPE_REALIZATIONS: {
-            TServiceTypeRealizations tServiceTypeRealizations = ( TServiceTypeRealizations ) theEObject;
-            T result = caseTServiceTypeRealizations( tServiceTypeRealizations );
+        case NsdPackage.SERVICE_TYPE_REALIZATIONS: {
+            ServiceTypeRealizations serviceTypeRealizations = ( ServiceTypeRealizations ) theEObject;
+            T result = caseServiceTypeRealizations( serviceTypeRealizations );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSUB_DATA_ATTRIBUTE: {
-            TSubDataAttribute tSubDataAttribute = ( TSubDataAttribute ) theEObject;
-            T result = caseTSubDataAttribute( tSubDataAttribute );
-            if( result == null ) result = caseTDocumentedClass( tSubDataAttribute );
+        case NsdPackage.SUB_DATA_ATTRIBUTE: {
+            SubDataAttribute subDataAttribute = ( SubDataAttribute ) theEObject;
+            T result = caseSubDataAttribute( subDataAttribute );
+            if( result == null ) result = caseDocumentedClass( subDataAttribute );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TSUB_DATA_OBJECT: {
-            TSubDataObject tSubDataObject = ( TSubDataObject ) theEObject;
-            T result = caseTSubDataObject( tSubDataObject );
-            if( result == null ) result = caseTDocumentedClass( tSubDataObject );
+        case NsdPackage.SUB_DATA_OBJECT: {
+            SubDataObject subDataObject = ( SubDataObject ) theEObject;
+            T result = caseSubDataObject( subDataObject );
+            if( result == null ) result = caseDocumentedClass( subDataObject );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
-        case NsdPackage.TTITLED_CLASS: {
-            TTitledClass tTitledClass = ( TTitledClass ) theEObject;
-            T result = caseTTitledClass( tTitledClass );
-            if( result == null ) result = caseTDocumentedClass( tTitledClass );
+        case NsdPackage.TITLED_CLASS: {
+            TitledClass titledClass = ( TitledClass ) theEObject;
+            T result = caseTitledClass( titledClass );
+            if( result == null ) result = caseDocumentedClass( titledClass );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE: {
+            NSDObjectWithVersionAndRelease nsdObjectWithVersionAndRelease = ( NSDObjectWithVersionAndRelease ) theEObject;
+            T result = caseNSDObjectWithVersionAndRelease( nsdObjectWithVersionAndRelease );
             if( result == null ) result = defaultCase( theEObject );
             return result;
         }
@@ -478,692 +491,707 @@ public class NsdSwitch< T > extends Switch< T > {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TAbbreviation</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Abbreviation</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Abbreviation</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseAbbreviation( Abbreviation object ) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Abbreviations</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TAbbreviation</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Abbreviations</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTAbbreviation( TAbbreviation object ) {
+    public T caseAbbreviations( Abbreviations object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TAbbreviations</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Abstract LN Class</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TAbbreviations</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Abstract LN Class</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTAbbreviations( TAbbreviations object ) {
+    public T caseAbstractLNClass( AbstractLNClass object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TAbstract LN Class</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Any LN Class</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TAbstract LN Class</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Any LN Class</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTAbstractLNClass( TAbstractLNClass object ) {
+    public T caseAnyLNClass( AnyLNClass object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TAny LN Class</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Applicable Service NS</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TAny LN Class</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Applicable Service NS</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTAnyLNClass( TAnyLNClass object ) {
+    public T caseApplicableServiceNS( ApplicableServiceNS object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TApplicable Service NS</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Applicable Services</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TApplicable Service NS</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Applicable Services</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTApplicableServiceNS( TApplicableServiceNS object ) {
+    public T caseApplicableServices( ApplicableServices object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TApplicable Services</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Basic Type</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TApplicable Services</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Basic Type</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTApplicableServices( TApplicableServices object ) {
+    public T caseBasicType( BasicType object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TBasic Type</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Basic Types</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TBasic Type</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Basic Types</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTBasicType( TBasicType object ) {
+    public T caseBasicTypes( BasicTypes object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TBasic Types</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>CDC</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TBasic Types</em>'.
+     * @return the result of interpreting the object as an instance of '<em>CDC</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTBasicTypes( TBasicTypes object ) {
+    public T caseCDC( CDC object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TCDC</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>CD Cs</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TCDC</em>'.
+     * @return the result of interpreting the object as an instance of '<em>CD Cs</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTCDC( TCDC object ) {
+    public T caseCDCs( CDCs object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TCD Cs</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Changes</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TCD Cs</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Changes</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTCDCs( TCDCs object ) {
+    public T caseChanges( Changes object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TChanges</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Constructed Attribute</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TChanges</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Constructed Attribute</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTChanges( TChanges object ) {
+    public T caseConstructedAttribute( ConstructedAttribute object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TConstructed Attribute</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Constructed Attributes</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TConstructed Attribute</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Constructed Attributes</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTConstructedAttribute( TConstructedAttribute object ) {
+    public T caseConstructedAttributes( ConstructedAttributes object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TConstructed Attributes</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Copyrighted</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TConstructed Attributes</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Copyrighted</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTConstructedAttributes( TConstructedAttributes object ) {
+    public T caseCopyrighted( Copyrighted object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TCopyrighted</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Copyright Notice</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TCopyrighted</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Copyright Notice</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTCopyrighted( TCopyrighted object ) {
+    public T caseCopyrightNotice( CopyrightNotice object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TCopyright Notice</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Data Attribute</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TCopyright Notice</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Data Attribute</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTCopyrightNotice( TCopyrightNotice object ) {
+    public T caseDataAttribute( DataAttribute object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TData Attribute</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Data Object</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TData Attribute</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Data Object</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTDataAttribute( TDataAttribute object ) {
+    public T caseDataObject( DataObject object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TData Object</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Data Set Member Of</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TData Object</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Data Set Member Of</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTDataObject( TDataObject object ) {
+    public T caseDataSetMemberOf( DataSetMemberOf object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TData Set Member Of</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Doc</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TData Set Member Of</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Doc</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTDataSetMemberOf( TDataSetMemberOf object ) {
+    public T caseDoc( Doc object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TDoc</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Documented Class</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TDoc</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Documented Class</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTDoc( TDoc object ) {
+    public T caseDocumentedClass( DocumentedClass object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TDocumented Class</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Enumeration</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TDocumented Class</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Enumeration</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTDocumentedClass( TDocumentedClass object ) {
+    public T caseEnumeration( Enumeration object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TEnumeration</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Enumerations</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TEnumeration</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Enumerations</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTEnumeration( TEnumeration object ) {
+    public T caseEnumerations( Enumerations object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TEnumerations</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Functional Constraint</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TEnumerations</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Functional Constraint</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTEnumerations( TEnumerations object ) {
+    public T caseFunctionalConstraint( FunctionalConstraint object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TFunctional Constraint</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Functional Constraints</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TFunctional Constraint</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Functional Constraints</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTFunctionalConstraint( TFunctionalConstraint object ) {
+    public T caseFunctionalConstraints( FunctionalConstraints object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TFunctional Constraints</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>License</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TFunctional Constraints</em>'.
+     * @return the result of interpreting the object as an instance of '<em>License</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTFunctionalConstraints( TFunctionalConstraints object ) {
+    public T caseLicense( License object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TLicense</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Literal</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TLicense</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Literal</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTLicense( TLicense object ) {
+    public T caseLiteral( Literal object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TLiteral</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>LN Class</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TLiteral</em>'.
+     * @return the result of interpreting the object as an instance of '<em>LN Class</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTLiteral( TLiteral object ) {
+    public T caseLNClass( LNClass object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TLN Class</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>LN Classes</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TLN Class</em>'.
+     * @return the result of interpreting the object as an instance of '<em>LN Classes</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTLNClass( TLNClass object ) {
+    public T caseLNClasses( LNClasses object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TLN Classes</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Notice</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TLN Classes</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Notice</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTLNClasses( TLNClasses object ) {
+    public T caseNotice( Notice object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TNotice</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>NS</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TNotice</em>'.
+     * @return the result of interpreting the object as an instance of '<em>NS</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTNotice( TNotice object ) {
+    public T caseNS( NS object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TNS</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>NS Doc</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TNS</em>'.
+     * @return the result of interpreting the object as an instance of '<em>NS Doc</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTNS( TNS object ) {
+    public T caseNSDoc( NSDoc object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TNS Doc</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Presence Condition</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TNS Doc</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Presence Condition</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTNSDoc( TNSDoc object ) {
+    public T casePresenceCondition( PresenceCondition object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TPresence Condition</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Presence Conditions</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TPresence Condition</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Presence Conditions</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTPresenceCondition( TPresenceCondition object ) {
+    public T casePresenceConditions( PresenceConditions object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TPresence Conditions</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service CDC</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TPresence Conditions</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service CDC</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTPresenceConditions( TPresenceConditions object ) {
+    public T caseServiceCDC( ServiceCDC object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService CDC</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service CD Cs</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService CDC</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service CD Cs</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceCDC( TServiceCDC object ) {
+    public T caseServiceCDCs( ServiceCDCs object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService CD Cs</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service Constructed Attribute</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService CD Cs</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service Constructed Attribute</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceCDCs( TServiceCDCs object ) {
+    public T caseServiceConstructedAttribute( ServiceConstructedAttribute object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService Constructed Attribute</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service Constructed Attributes</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService Constructed Attribute</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service Constructed Attributes</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceConstructedAttribute( TServiceConstructedAttribute object ) {
+    public T caseServiceConstructedAttributes( ServiceConstructedAttributes object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService Constructed Attributes</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service Data Attribute</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService Constructed Attributes</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service Data Attribute</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceConstructedAttributes( TServiceConstructedAttributes object ) {
+    public T caseServiceDataAttribute( ServiceDataAttribute object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService Data Attribute</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service NS</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService Data Attribute</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service NS</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceDataAttribute( TServiceDataAttribute object ) {
+    public T caseServiceNS( ServiceNS object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService NS</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service Ns Usage</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService NS</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service Ns Usage</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceNS( TServiceNS object ) {
+    public T caseServiceNsUsage( ServiceNsUsage object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService Ns Usage</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service Parameter</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService Ns Usage</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service Parameter</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceNsUsage( TServiceNsUsage object ) {
+    public T caseServiceParameter( ServiceParameter object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService Parameter</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service Type Realization</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService Parameter</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service Type Realization</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceParameter( TServiceParameter object ) {
+    public T caseServiceTypeRealization( ServiceTypeRealization object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService Type Realization</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Service Type Realizations</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService Type Realization</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Service Type Realizations</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceTypeRealization( TServiceTypeRealization object ) {
+    public T caseServiceTypeRealizations( ServiceTypeRealizations object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TService Type Realizations</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Sub Data Attribute</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TService Type Realizations</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Sub Data Attribute</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTServiceTypeRealizations( TServiceTypeRealizations object ) {
+    public T caseSubDataAttribute( SubDataAttribute object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TSub Data Attribute</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Sub Data Object</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TSub Data Attribute</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Sub Data Object</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTSubDataAttribute( TSubDataAttribute object ) {
+    public T caseSubDataObject( SubDataObject object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TSub Data Object</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>Titled Class</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TSub Data Object</em>'.
+     * @return the result of interpreting the object as an instance of '<em>Titled Class</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTSubDataObject( TSubDataObject object ) {
+    public T caseTitledClass( TitledClass object ) {
         return null;
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>TTitled Class</em>'.
+     * Returns the result of interpreting the object as an instance of '<em>NSD Object With Version And Release</em>'.
      * <!-- begin-user-doc -->
      * This implementation returns null;
      * returning a non-null result will terminate the switch.
      * <!-- end-user-doc -->
      * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>TTitled Class</em>'.
+     * @return the result of interpreting the object as an instance of '<em>NSD Object With Version And Release</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTTitledClass( TTitledClass object ) {
+    public T caseNSDObjectWithVersionAndRelease( NSDObjectWithVersionAndRelease object ) {
         return null;
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdValidator.java
index 732dd4a534e981fa6695272621d350d86d63f7f2..e3d00b4da7abcc4ed8d8c34c6eac58e51e4d940e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdValidator.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdValidator.java
@@ -33,9 +33,6 @@ import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.EObjectValidator;
 
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator;
-
 /**
  * <!-- begin-user-doc -->
  * The <b>Validator</b> for the model.
@@ -78,14 +75,6 @@ public class NsdValidator extends EObjectValidator {
      */
     protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
 
-    /**
-     * The cached base package validator.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected XMLTypeValidator xmlTypeValidator;
-
     /**
      * Creates an instance of the switch.
      * <!-- begin-user-doc -->
@@ -94,7 +83,6 @@ public class NsdValidator extends EObjectValidator {
      */
     public NsdValidator() {
         super();
-        xmlTypeValidator = XMLTypeValidator.INSTANCE;
     }
 
     /**
@@ -126,173 +114,127 @@ public class NsdValidator extends EObjectValidator {
             return validateDocumentRoot( ( DocumentRoot ) value, diagnostics, context );
         case NsdPackage.SERVICE_TYPE:
             return validateServiceType( ( ServiceType ) value, diagnostics, context );
-        case NsdPackage.TABBREVIATION:
-            return validateTAbbreviation( ( TAbbreviation ) value, diagnostics, context );
-        case NsdPackage.TABBREVIATIONS:
-            return validateTAbbreviations( ( TAbbreviations ) value, diagnostics, context );
-        case NsdPackage.TABSTRACT_LN_CLASS:
-            return validateTAbstractLNClass( ( TAbstractLNClass ) value, diagnostics, context );
-        case NsdPackage.TANY_LN_CLASS:
-            return validateTAnyLNClass( ( TAnyLNClass ) value, diagnostics, context );
-        case NsdPackage.TAPPLICABLE_SERVICE_NS:
-            return validateTApplicableServiceNS( ( TApplicableServiceNS ) value, diagnostics, context );
-        case NsdPackage.TAPPLICABLE_SERVICES:
-            return validateTApplicableServices( ( TApplicableServices ) value, diagnostics, context );
-        case NsdPackage.TBASIC_TYPE:
-            return validateTBasicType( ( TBasicType ) value, diagnostics, context );
-        case NsdPackage.TBASIC_TYPES:
-            return validateTBasicTypes( ( TBasicTypes ) value, diagnostics, context );
-        case NsdPackage.TCDC:
-            return validateTCDC( ( TCDC ) value, diagnostics, context );
-        case NsdPackage.TCD_CS:
-            return validateTCDCs( ( TCDCs ) value, diagnostics, context );
-        case NsdPackage.TCHANGES:
-            return validateTChanges( ( TChanges ) value, diagnostics, context );
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTE:
-            return validateTConstructedAttribute( ( TConstructedAttribute ) value, diagnostics, context );
-        case NsdPackage.TCONSTRUCTED_ATTRIBUTES:
-            return validateTConstructedAttributes( ( TConstructedAttributes ) value, diagnostics, context );
-        case NsdPackage.TCOPYRIGHTED:
-            return validateTCopyrighted( ( TCopyrighted ) value, diagnostics, context );
-        case NsdPackage.TCOPYRIGHT_NOTICE:
-            return validateTCopyrightNotice( ( TCopyrightNotice ) value, diagnostics, context );
-        case NsdPackage.TDATA_ATTRIBUTE:
-            return validateTDataAttribute( ( TDataAttribute ) value, diagnostics, context );
-        case NsdPackage.TDATA_OBJECT:
-            return validateTDataObject( ( TDataObject ) value, diagnostics, context );
-        case NsdPackage.TDATA_SET_MEMBER_OF:
-            return validateTDataSetMemberOf( ( TDataSetMemberOf ) value, diagnostics, context );
-        case NsdPackage.TDOC:
-            return validateTDoc( ( TDoc ) value, diagnostics, context );
-        case NsdPackage.TDOCUMENTED_CLASS:
-            return validateTDocumentedClass( ( TDocumentedClass ) value, diagnostics, context );
-        case NsdPackage.TENUMERATION:
-            return validateTEnumeration( ( TEnumeration ) value, diagnostics, context );
-        case NsdPackage.TENUMERATIONS:
-            return validateTEnumerations( ( TEnumerations ) value, diagnostics, context );
-        case NsdPackage.TFUNCTIONAL_CONSTRAINT:
-            return validateTFunctionalConstraint( ( TFunctionalConstraint ) value, diagnostics, context );
-        case NsdPackage.TFUNCTIONAL_CONSTRAINTS:
-            return validateTFunctionalConstraints( ( TFunctionalConstraints ) value, diagnostics, context );
-        case NsdPackage.TLICENSE:
-            return validateTLicense( ( TLicense ) value, diagnostics, context );
-        case NsdPackage.TLITERAL:
-            return validateTLiteral( ( TLiteral ) value, diagnostics, context );
-        case NsdPackage.TLN_CLASS:
-            return validateTLNClass( ( TLNClass ) value, diagnostics, context );
-        case NsdPackage.TLN_CLASSES:
-            return validateTLNClasses( ( TLNClasses ) value, diagnostics, context );
-        case NsdPackage.TNOTICE:
-            return validateTNotice( ( TNotice ) value, diagnostics, context );
-        case NsdPackage.TNS:
-            return validateTNS( ( TNS ) value, diagnostics, context );
-        case NsdPackage.TNS_DOC:
-            return validateTNSDoc( ( TNSDoc ) value, diagnostics, context );
-        case NsdPackage.TPRESENCE_CONDITION:
-            return validateTPresenceCondition( ( TPresenceCondition ) value, diagnostics, context );
-        case NsdPackage.TPRESENCE_CONDITIONS:
-            return validateTPresenceConditions( ( TPresenceConditions ) value, diagnostics, context );
-        case NsdPackage.TSERVICE_CDC:
-            return validateTServiceCDC( ( TServiceCDC ) value, diagnostics, context );
-        case NsdPackage.TSERVICE_CD_CS:
-            return validateTServiceCDCs( ( TServiceCDCs ) value, diagnostics, context );
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTE:
-            return validateTServiceConstructedAttribute( ( TServiceConstructedAttribute ) value, diagnostics, context );
-        case NsdPackage.TSERVICE_CONSTRUCTED_ATTRIBUTES:
-            return validateTServiceConstructedAttributes( ( TServiceConstructedAttributes ) value, diagnostics,
+        case NsdPackage.ABBREVIATION:
+            return validateAbbreviation( ( Abbreviation ) value, diagnostics, context );
+        case NsdPackage.ABBREVIATIONS:
+            return validateAbbreviations( ( Abbreviations ) value, diagnostics, context );
+        case NsdPackage.ABSTRACT_LN_CLASS:
+            return validateAbstractLNClass( ( AbstractLNClass ) value, diagnostics, context );
+        case NsdPackage.ANY_LN_CLASS:
+            return validateAnyLNClass( ( AnyLNClass ) value, diagnostics, context );
+        case NsdPackage.APPLICABLE_SERVICE_NS:
+            return validateApplicableServiceNS( ( ApplicableServiceNS ) value, diagnostics, context );
+        case NsdPackage.APPLICABLE_SERVICES:
+            return validateApplicableServices( ( ApplicableServices ) value, diagnostics, context );
+        case NsdPackage.BASIC_TYPE:
+            return validateBasicType( ( BasicType ) value, diagnostics, context );
+        case NsdPackage.BASIC_TYPES:
+            return validateBasicTypes( ( BasicTypes ) value, diagnostics, context );
+        case NsdPackage.CDC:
+            return validateCDC( ( CDC ) value, diagnostics, context );
+        case NsdPackage.CD_CS:
+            return validateCDCs( ( CDCs ) value, diagnostics, context );
+        case NsdPackage.CHANGES:
+            return validateChanges( ( Changes ) value, diagnostics, context );
+        case NsdPackage.CONSTRUCTED_ATTRIBUTE:
+            return validateConstructedAttribute( ( ConstructedAttribute ) value, diagnostics, context );
+        case NsdPackage.CONSTRUCTED_ATTRIBUTES:
+            return validateConstructedAttributes( ( ConstructedAttributes ) value, diagnostics, context );
+        case NsdPackage.COPYRIGHTED:
+            return validateCopyrighted( ( Copyrighted ) value, diagnostics, context );
+        case NsdPackage.COPYRIGHT_NOTICE:
+            return validateCopyrightNotice( ( CopyrightNotice ) value, diagnostics, context );
+        case NsdPackage.DATA_ATTRIBUTE:
+            return validateDataAttribute( ( DataAttribute ) value, diagnostics, context );
+        case NsdPackage.DATA_OBJECT:
+            return validateDataObject( ( DataObject ) value, diagnostics, context );
+        case NsdPackage.DATA_SET_MEMBER_OF:
+            return validateDataSetMemberOf( ( DataSetMemberOf ) value, diagnostics, context );
+        case NsdPackage.DOC:
+            return validateDoc( ( Doc ) value, diagnostics, context );
+        case NsdPackage.DOCUMENTED_CLASS:
+            return validateDocumentedClass( ( DocumentedClass ) value, diagnostics, context );
+        case NsdPackage.ENUMERATION:
+            return validateEnumeration( ( Enumeration ) value, diagnostics, context );
+        case NsdPackage.ENUMERATIONS:
+            return validateEnumerations( ( Enumerations ) value, diagnostics, context );
+        case NsdPackage.FUNCTIONAL_CONSTRAINT:
+            return validateFunctionalConstraint( ( FunctionalConstraint ) value, diagnostics, context );
+        case NsdPackage.FUNCTIONAL_CONSTRAINTS:
+            return validateFunctionalConstraints( ( FunctionalConstraints ) value, diagnostics, context );
+        case NsdPackage.LICENSE:
+            return validateLicense( ( License ) value, diagnostics, context );
+        case NsdPackage.LITERAL:
+            return validateLiteral( ( Literal ) value, diagnostics, context );
+        case NsdPackage.LN_CLASS:
+            return validateLNClass( ( LNClass ) value, diagnostics, context );
+        case NsdPackage.LN_CLASSES:
+            return validateLNClasses( ( LNClasses ) value, diagnostics, context );
+        case NsdPackage.NOTICE:
+            return validateNotice( ( Notice ) value, diagnostics, context );
+        case NsdPackage.NS:
+            return validateNS( ( NS ) value, diagnostics, context );
+        case NsdPackage.NS_DOC:
+            return validateNSDoc( ( NSDoc ) value, diagnostics, context );
+        case NsdPackage.PRESENCE_CONDITION:
+            return validatePresenceCondition( ( PresenceCondition ) value, diagnostics, context );
+        case NsdPackage.PRESENCE_CONDITIONS:
+            return validatePresenceConditions( ( PresenceConditions ) value, diagnostics, context );
+        case NsdPackage.SERVICE_CDC:
+            return validateServiceCDC( ( ServiceCDC ) value, diagnostics, context );
+        case NsdPackage.SERVICE_CD_CS:
+            return validateServiceCDCs( ( ServiceCDCs ) value, diagnostics, context );
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE:
+            return validateServiceConstructedAttribute( ( ServiceConstructedAttribute ) value, diagnostics, context );
+        case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES:
+            return validateServiceConstructedAttributes( ( ServiceConstructedAttributes ) value, diagnostics, context );
+        case NsdPackage.SERVICE_DATA_ATTRIBUTE:
+            return validateServiceDataAttribute( ( ServiceDataAttribute ) value, diagnostics, context );
+        case NsdPackage.SERVICE_NS:
+            return validateServiceNS( ( ServiceNS ) value, diagnostics, context );
+        case NsdPackage.SERVICE_NS_USAGE:
+            return validateServiceNsUsage( ( ServiceNsUsage ) value, diagnostics, context );
+        case NsdPackage.SERVICE_PARAMETER:
+            return validateServiceParameter( ( ServiceParameter ) value, diagnostics, context );
+        case NsdPackage.SERVICE_TYPE_REALIZATION:
+            return validateServiceTypeRealization( ( ServiceTypeRealization ) value, diagnostics, context );
+        case NsdPackage.SERVICE_TYPE_REALIZATIONS:
+            return validateServiceTypeRealizations( ( ServiceTypeRealizations ) value, diagnostics, context );
+        case NsdPackage.SUB_DATA_ATTRIBUTE:
+            return validateSubDataAttribute( ( SubDataAttribute ) value, diagnostics, context );
+        case NsdPackage.SUB_DATA_OBJECT:
+            return validateSubDataObject( ( SubDataObject ) value, diagnostics, context );
+        case NsdPackage.TITLED_CLASS:
+            return validateTitledClass( ( TitledClass ) value, diagnostics, context );
+        case NsdPackage.NSD_OBJECT_WITH_VERSION_AND_RELEASE:
+            return validateNSDObjectWithVersionAndRelease( ( NSDObjectWithVersionAndRelease ) value, diagnostics,
                     context );
-        case NsdPackage.TSERVICE_DATA_ATTRIBUTE:
-            return validateTServiceDataAttribute( ( TServiceDataAttribute ) value, diagnostics, context );
-        case NsdPackage.TSERVICE_NS:
-            return validateTServiceNS( ( TServiceNS ) value, diagnostics, context );
-        case NsdPackage.TSERVICE_NS_USAGE:
-            return validateTServiceNsUsage( ( TServiceNsUsage ) value, diagnostics, context );
-        case NsdPackage.TSERVICE_PARAMETER:
-            return validateTServiceParameter( ( TServiceParameter ) value, diagnostics, context );
-        case NsdPackage.TSERVICE_TYPE_REALIZATION:
-            return validateTServiceTypeRealization( ( TServiceTypeRealization ) value, diagnostics, context );
-        case NsdPackage.TSERVICE_TYPE_REALIZATIONS:
-            return validateTServiceTypeRealizations( ( TServiceTypeRealizations ) value, diagnostics, context );
-        case NsdPackage.TSUB_DATA_ATTRIBUTE:
-            return validateTSubDataAttribute( ( TSubDataAttribute ) value, diagnostics, context );
-        case NsdPackage.TSUB_DATA_OBJECT:
-            return validateTSubDataObject( ( TSubDataObject ) value, diagnostics, context );
-        case NsdPackage.TTITLED_CLASS:
-            return validateTTitledClass( ( TTitledClass ) value, diagnostics, context );
-        case NsdPackage.TACSI_SERVICES_KIND:
-            return validateTACSIServicesKind( ( TACSIServicesKind ) value, diagnostics, context );
-        case NsdPackage.TCB_KIND:
-            return validateTCBKind( ( TCBKind ) value, diagnostics, context );
-        case NsdPackage.TDEFINED_ATTRIBUTE_TYPE_KIND:
-            return validateTDefinedAttributeTypeKind( ( TDefinedAttributeTypeKind ) value, diagnostics, context );
-        case NsdPackage.TLICENSE_KIND:
-            return validateTLicenseKind( ( TLicenseKind ) value, diagnostics, context );
-        case NsdPackage.TPUB_STAGE:
-            return validateTPubStage( ( TPubStage ) value, diagnostics, context );
-        case NsdPackage.TUNDEFINED_ATTRIBUTE_TYPE_KIND:
-            return validateTUndefinedAttributeTypeKind( ( TUndefinedAttributeTypeKind ) value, diagnostics, context );
-        case NsdPackage.TABBREVIATION_NAME:
-            return validateTAbbreviationName( ( String ) value, diagnostics, context );
-        case NsdPackage.TABSTRACT_LN_CLASS_NAME:
-            return validateTAbstractLNClassName( ( String ) value, diagnostics, context );
-        case NsdPackage.TACSI_SERVICES_KIND_OBJECT:
-            return validateTACSIServicesKindObject( ( TACSIServicesKind ) value, diagnostics, context );
-        case NsdPackage.TATTRIBUTE_NAME:
-            return validateTAttributeName( ( String ) value, diagnostics, context );
-        case NsdPackage.TATTRIBUTE_TYPE_KIND:
-            return validateTAttributeTypeKind( ( Enumerator ) value, diagnostics, context );
-        case NsdPackage.TBASIC_TYPE_NAME:
-            return validateTBasicTypeName( ( String ) value, diagnostics, context );
-        case NsdPackage.TCB_KIND_OBJECT:
-            return validateTCBKindObject( ( TCBKind ) value, diagnostics, context );
-        case NsdPackage.TCDC_NAME:
-            return validateTCDCName( ( String ) value, diagnostics, context );
-        case NsdPackage.TDATA_OBJECT_NAME:
-            return validateTDataObjectName( ( String ) value, diagnostics, context );
-        case NsdPackage.TDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
-            return validateTDefinedAttributeTypeKindObject( ( TDefinedAttributeTypeKind ) value, diagnostics, context );
-        case NsdPackage.TDOC_ID:
-            return validateTDocID( ( String ) value, diagnostics, context );
-        case NsdPackage.TEMPTY_STRING:
-            return validateTEmptyString( ( String ) value, diagnostics, context );
-        case NsdPackage.TFC_ABBREVIATION:
-            return validateTFCAbbreviation( ( String ) value, diagnostics, context );
-        case NsdPackage.TIEC61850_NAME:
-            return validateTIec61850Name( ( String ) value, diagnostics, context );
-        case NsdPackage.TIEC61850_NAME_STRING:
-            return validateTIec61850NameString( ( String ) value, diagnostics, context );
-        case NsdPackage.TISSUES_TYPE:
-            return validateTissuesType( ( String ) value, diagnostics, context );
-        case NsdPackage.TLICENSE_KIND_OBJECT:
-            return validateTLicenseKindObject( ( TLicenseKind ) value, diagnostics, context );
-        case NsdPackage.TLITERAL_NAME:
-            return validateTLiteralName( ( String ) value, diagnostics, context );
-        case NsdPackage.TLN_CLASS_NAME:
-            return validateTLNClassName( ( String ) value, diagnostics, context );
-        case NsdPackage.TNS_IDENTIFIER:
-            return validateTNSIdentifier( ( String ) value, diagnostics, context );
-        case NsdPackage.TNS_RELEASE:
-            return validateTNSRelease( ( Short ) value, diagnostics, context );
-        case NsdPackage.TNS_RELEASE_OBJECT:
-            return validateTNSReleaseObject( ( Short ) value, diagnostics, context );
-        case NsdPackage.TNS_REVISION:
-            return validateTNSRevision( ( String ) value, diagnostics, context );
-        case NsdPackage.TNS_VERSION:
-            return validateTNSVersion( ( Integer ) value, diagnostics, context );
-        case NsdPackage.TNS_VERSION_OBJECT:
-            return validateTNSVersionObject( ( Integer ) value, diagnostics, context );
-        case NsdPackage.TPRESENCE_CONDITION_ARGUMENT:
-            return validateTPresenceConditionArgument( ( String ) value, diagnostics, context );
-        case NsdPackage.TPRESENCE_CONDITION_NAME:
-            return validateTPresenceConditionName( ( String ) value, diagnostics, context );
-        case NsdPackage.TPUB_STAGE_OBJECT:
-            return validateTPubStageObject( ( TPubStage ) value, diagnostics, context );
-        case NsdPackage.TSUB_DATA_OBJECT_NAME:
-            return validateTSubDataObjectName( ( String ) value, diagnostics, context );
-        case NsdPackage.TUML_VERSION:
-            return validateTUMLVersion( ( String ) value, diagnostics, context );
-        case NsdPackage.TUNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
-            return validateTUndefinedAttributeTypeKindObject( ( TUndefinedAttributeTypeKind ) value, diagnostics,
+        case NsdPackage.ACSI_SERVICES_KIND:
+            return validateACSIServicesKind( ( ACSIServicesKind ) value, diagnostics, context );
+        case NsdPackage.CB_KIND:
+            return validateCBKind( ( CBKind ) value, diagnostics, context );
+        case NsdPackage.DEFINED_ATTRIBUTE_TYPE_KIND:
+            return validateDefinedAttributeTypeKind( ( DefinedAttributeTypeKind ) value, diagnostics, context );
+        case NsdPackage.LICENSE_KIND:
+            return validateLicenseKind( ( LicenseKind ) value, diagnostics, context );
+        case NsdPackage.PUB_STAGE:
+            return validatePubStage( ( PubStage ) value, diagnostics, context );
+        case NsdPackage.UNDEFINED_ATTRIBUTE_TYPE_KIND:
+            return validateUndefinedAttributeTypeKind( ( UndefinedAttributeTypeKind ) value, diagnostics, context );
+        case NsdPackage.ACSI_SERVICES_KIND_OBJECT:
+            return validateACSIServicesKindObject( ( ACSIServicesKind ) value, diagnostics, context );
+        case NsdPackage.ATTRIBUTE_TYPE_KIND:
+            return validateAttributeTypeKind( ( Enumerator ) value, diagnostics, context );
+        case NsdPackage.CB_KIND_OBJECT:
+            return validateCBKindObject( ( CBKind ) value, diagnostics, context );
+        case NsdPackage.DEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
+            return validateDefinedAttributeTypeKindObject( ( DefinedAttributeTypeKind ) value, diagnostics, context );
+        case NsdPackage.LICENSE_KIND_OBJECT:
+            return validateLicenseKindObject( ( LicenseKind ) value, diagnostics, context );
+        case NsdPackage.PUB_STAGE_OBJECT:
+            return validatePubStageObject( ( PubStage ) value, diagnostics, context );
+        case NsdPackage.UNDEFINED_ATTRIBUTE_TYPE_KIND_OBJECT:
+            return validateUndefinedAttributeTypeKindObject( ( UndefinedAttributeTypeKind ) value, diagnostics,
                     context );
         default:
             return true;
@@ -344,9 +286,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTAbbreviation( TAbbreviation tAbbreviation, DiagnosticChain diagnostics,
+    public boolean validateAbbreviation( Abbreviation abbreviation, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tAbbreviation, diagnostics, context );
+        return validate_EveryDefaultConstraint( abbreviation, diagnostics, context );
     }
 
     /**
@@ -354,9 +296,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTAbbreviations( TAbbreviations tAbbreviations, DiagnosticChain diagnostics,
+    public boolean validateAbbreviations( Abbreviations abbreviations, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tAbbreviations, diagnostics, context );
+        return validate_EveryDefaultConstraint( abbreviations, diagnostics, context );
     }
 
     /**
@@ -364,9 +306,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTAbstractLNClass( TAbstractLNClass tAbstractLNClass, DiagnosticChain diagnostics,
+    public boolean validateAbstractLNClass( AbstractLNClass abstractLNClass, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tAbstractLNClass, diagnostics, context );
+        return validate_EveryDefaultConstraint( abstractLNClass, diagnostics, context );
     }
 
     /**
@@ -374,9 +316,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTAnyLNClass( TAnyLNClass tAnyLNClass, DiagnosticChain diagnostics,
+    public boolean validateAnyLNClass( AnyLNClass anyLNClass, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tAnyLNClass, diagnostics, context );
+        return validate_EveryDefaultConstraint( anyLNClass, diagnostics, context );
     }
 
     /**
@@ -384,9 +326,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTApplicableServiceNS( TApplicableServiceNS tApplicableServiceNS, DiagnosticChain diagnostics,
+    public boolean validateApplicableServiceNS( ApplicableServiceNS applicableServiceNS, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tApplicableServiceNS, diagnostics, context );
+        return validate_EveryDefaultConstraint( applicableServiceNS, diagnostics, context );
     }
 
     /**
@@ -394,9 +336,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTApplicableServices( TApplicableServices tApplicableServices, DiagnosticChain diagnostics,
+    public boolean validateApplicableServices( ApplicableServices applicableServices, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tApplicableServices, diagnostics, context );
+        return validate_EveryDefaultConstraint( applicableServices, diagnostics, context );
     }
 
     /**
@@ -404,9 +346,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTBasicType( TBasicType tBasicType, DiagnosticChain diagnostics,
+    public boolean validateBasicType( BasicType basicType, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tBasicType, diagnostics, context );
+        return validate_EveryDefaultConstraint( basicType, diagnostics, context );
     }
 
     /**
@@ -414,9 +356,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTBasicTypes( TBasicTypes tBasicTypes, DiagnosticChain diagnostics,
+    public boolean validateBasicTypes( BasicTypes basicTypes, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tBasicTypes, diagnostics, context );
+        return validate_EveryDefaultConstraint( basicTypes, diagnostics, context );
     }
 
     /**
@@ -424,8 +366,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTCDC( TCDC tcdc, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tcdc, diagnostics, context );
+    public boolean validateCDC( CDC cdc, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( cdc, diagnostics, context );
     }
 
     /**
@@ -433,8 +375,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTCDCs( TCDCs tcdCs, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tcdCs, diagnostics, context );
+    public boolean validateCDCs( CDCs cdCs, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( cdCs, diagnostics, context );
     }
 
     /**
@@ -442,8 +384,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTChanges( TChanges tChanges, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tChanges, diagnostics, context );
+    public boolean validateChanges( Changes changes, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( changes, diagnostics, context );
     }
 
     /**
@@ -451,9 +393,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTConstructedAttribute( TConstructedAttribute tConstructedAttribute,
-            DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tConstructedAttribute, diagnostics, context );
+    public boolean validateConstructedAttribute( ConstructedAttribute constructedAttribute, DiagnosticChain diagnostics,
+            Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( constructedAttribute, diagnostics, context );
     }
 
     /**
@@ -461,9 +403,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTConstructedAttributes( TConstructedAttributes tConstructedAttributes,
+    public boolean validateConstructedAttributes( ConstructedAttributes constructedAttributes,
             DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tConstructedAttributes, diagnostics, context );
+        return validate_EveryDefaultConstraint( constructedAttributes, diagnostics, context );
     }
 
     /**
@@ -471,9 +413,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTCopyrighted( TCopyrighted tCopyrighted, DiagnosticChain diagnostics,
+    public boolean validateCopyrighted( Copyrighted copyrighted, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tCopyrighted, diagnostics, context );
+        return validate_EveryDefaultConstraint( copyrighted, diagnostics, context );
     }
 
     /**
@@ -481,9 +423,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTCopyrightNotice( TCopyrightNotice tCopyrightNotice, DiagnosticChain diagnostics,
+    public boolean validateCopyrightNotice( CopyrightNotice copyrightNotice, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tCopyrightNotice, diagnostics, context );
+        return validate_EveryDefaultConstraint( copyrightNotice, diagnostics, context );
     }
 
     /**
@@ -491,9 +433,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTDataAttribute( TDataAttribute tDataAttribute, DiagnosticChain diagnostics,
+    public boolean validateDataAttribute( DataAttribute dataAttribute, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tDataAttribute, diagnostics, context );
+        return validate_EveryDefaultConstraint( dataAttribute, diagnostics, context );
     }
 
     /**
@@ -501,9 +443,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTDataObject( TDataObject tDataObject, DiagnosticChain diagnostics,
+    public boolean validateDataObject( DataObject dataObject, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tDataObject, diagnostics, context );
+        return validate_EveryDefaultConstraint( dataObject, diagnostics, context );
     }
 
     /**
@@ -511,9 +453,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTDataSetMemberOf( TDataSetMemberOf tDataSetMemberOf, DiagnosticChain diagnostics,
+    public boolean validateDataSetMemberOf( DataSetMemberOf dataSetMemberOf, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tDataSetMemberOf, diagnostics, context );
+        return validate_EveryDefaultConstraint( dataSetMemberOf, diagnostics, context );
     }
 
     /**
@@ -521,8 +463,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTDoc( TDoc tDoc, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tDoc, diagnostics, context );
+    public boolean validateDoc( Doc doc, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( doc, diagnostics, context );
     }
 
     /**
@@ -530,9 +472,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTDocumentedClass( TDocumentedClass tDocumentedClass, DiagnosticChain diagnostics,
+    public boolean validateDocumentedClass( DocumentedClass documentedClass, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tDocumentedClass, diagnostics, context );
+        return validate_EveryDefaultConstraint( documentedClass, diagnostics, context );
     }
 
     /**
@@ -540,9 +482,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTEnumeration( TEnumeration tEnumeration, DiagnosticChain diagnostics,
+    public boolean validateEnumeration( Enumeration enumeration, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tEnumeration, diagnostics, context );
+        return validate_EveryDefaultConstraint( enumeration, diagnostics, context );
     }
 
     /**
@@ -550,9 +492,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTEnumerations( TEnumerations tEnumerations, DiagnosticChain diagnostics,
+    public boolean validateEnumerations( Enumerations enumerations, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tEnumerations, diagnostics, context );
+        return validate_EveryDefaultConstraint( enumerations, diagnostics, context );
     }
 
     /**
@@ -560,9 +502,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTFunctionalConstraint( TFunctionalConstraint tFunctionalConstraint,
-            DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tFunctionalConstraint, diagnostics, context );
+    public boolean validateFunctionalConstraint( FunctionalConstraint functionalConstraint, DiagnosticChain diagnostics,
+            Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( functionalConstraint, diagnostics, context );
     }
 
     /**
@@ -570,9 +512,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTFunctionalConstraints( TFunctionalConstraints tFunctionalConstraints,
+    public boolean validateFunctionalConstraints( FunctionalConstraints functionalConstraints,
             DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tFunctionalConstraints, diagnostics, context );
+        return validate_EveryDefaultConstraint( functionalConstraints, diagnostics, context );
     }
 
     /**
@@ -580,8 +522,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTLicense( TLicense tLicense, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tLicense, diagnostics, context );
+    public boolean validateLicense( License license, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( license, diagnostics, context );
     }
 
     /**
@@ -589,8 +531,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTLiteral( TLiteral tLiteral, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tLiteral, diagnostics, context );
+    public boolean validateLiteral( Literal literal, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( literal, diagnostics, context );
     }
 
     /**
@@ -598,8 +540,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTLNClass( TLNClass tlnClass, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tlnClass, diagnostics, context );
+    public boolean validateLNClass( LNClass lnClass, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( lnClass, diagnostics, context );
     }
 
     /**
@@ -607,9 +549,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTLNClasses( TLNClasses tlnClasses, DiagnosticChain diagnostics,
+    public boolean validateLNClasses( LNClasses lnClasses, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tlnClasses, diagnostics, context );
+        return validate_EveryDefaultConstraint( lnClasses, diagnostics, context );
     }
 
     /**
@@ -617,8 +559,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTNotice( TNotice tNotice, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tNotice, diagnostics, context );
+    public boolean validateNotice( Notice notice, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( notice, diagnostics, context );
     }
 
     /**
@@ -626,8 +568,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTNS( TNS tns, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tns, diagnostics, context );
+    public boolean validateNS( NS ns, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( ns, diagnostics, context );
     }
 
     /**
@@ -635,8 +577,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTNSDoc( TNSDoc tnsDoc, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tnsDoc, diagnostics, context );
+    public boolean validateNSDoc( NSDoc nsDoc, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( nsDoc, diagnostics, context );
     }
 
     /**
@@ -644,9 +586,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTPresenceCondition( TPresenceCondition tPresenceCondition, DiagnosticChain diagnostics,
+    public boolean validatePresenceCondition( PresenceCondition presenceCondition, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tPresenceCondition, diagnostics, context );
+        return validate_EveryDefaultConstraint( presenceCondition, diagnostics, context );
     }
 
     /**
@@ -654,9 +596,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTPresenceConditions( TPresenceConditions tPresenceConditions, DiagnosticChain diagnostics,
+    public boolean validatePresenceConditions( PresenceConditions presenceConditions, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tPresenceConditions, diagnostics, context );
+        return validate_EveryDefaultConstraint( presenceConditions, diagnostics, context );
     }
 
     /**
@@ -664,9 +606,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceCDC( TServiceCDC tServiceCDC, DiagnosticChain diagnostics,
+    public boolean validateServiceCDC( ServiceCDC serviceCDC, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceCDC, diagnostics, context );
+        return validate_EveryDefaultConstraint( serviceCDC, diagnostics, context );
     }
 
     /**
@@ -674,9 +616,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceCDCs( TServiceCDCs tServiceCDCs, DiagnosticChain diagnostics,
+    public boolean validateServiceCDCs( ServiceCDCs serviceCDCs, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceCDCs, diagnostics, context );
+        return validate_EveryDefaultConstraint( serviceCDCs, diagnostics, context );
     }
 
     /**
@@ -684,9 +626,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceConstructedAttribute( TServiceConstructedAttribute tServiceConstructedAttribute,
+    public boolean validateServiceConstructedAttribute( ServiceConstructedAttribute serviceConstructedAttribute,
             DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceConstructedAttribute, diagnostics, context );
+        return validate_EveryDefaultConstraint( serviceConstructedAttribute, diagnostics, context );
     }
 
     /**
@@ -694,9 +636,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceConstructedAttributes( TServiceConstructedAttributes tServiceConstructedAttributes,
+    public boolean validateServiceConstructedAttributes( ServiceConstructedAttributes serviceConstructedAttributes,
             DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceConstructedAttributes, diagnostics, context );
+        return validate_EveryDefaultConstraint( serviceConstructedAttributes, diagnostics, context );
     }
 
     /**
@@ -704,9 +646,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceDataAttribute( TServiceDataAttribute tServiceDataAttribute,
-            DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceDataAttribute, diagnostics, context );
+    public boolean validateServiceDataAttribute( ServiceDataAttribute serviceDataAttribute, DiagnosticChain diagnostics,
+            Map< Object, Object > context ) {
+        return validate_EveryDefaultConstraint( serviceDataAttribute, diagnostics, context );
     }
 
     /**
@@ -714,9 +656,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceNS( TServiceNS tServiceNS, DiagnosticChain diagnostics,
+    public boolean validateServiceNS( ServiceNS serviceNS, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceNS, diagnostics, context );
+        return validate_EveryDefaultConstraint( serviceNS, diagnostics, context );
     }
 
     /**
@@ -724,9 +666,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceNsUsage( TServiceNsUsage tServiceNsUsage, DiagnosticChain diagnostics,
+    public boolean validateServiceNsUsage( ServiceNsUsage serviceNsUsage, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceNsUsage, diagnostics, context );
+        return validate_EveryDefaultConstraint( serviceNsUsage, diagnostics, context );
     }
 
     /**
@@ -734,9 +676,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceParameter( TServiceParameter tServiceParameter, DiagnosticChain diagnostics,
+    public boolean validateServiceParameter( ServiceParameter serviceParameter, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceParameter, diagnostics, context );
+        return validate_EveryDefaultConstraint( serviceParameter, diagnostics, context );
     }
 
     /**
@@ -744,9 +686,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceTypeRealization( TServiceTypeRealization tServiceTypeRealization,
+    public boolean validateServiceTypeRealization( ServiceTypeRealization serviceTypeRealization,
             DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceTypeRealization, diagnostics, context );
+        return validate_EveryDefaultConstraint( serviceTypeRealization, diagnostics, context );
     }
 
     /**
@@ -754,9 +696,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTServiceTypeRealizations( TServiceTypeRealizations tServiceTypeRealizations,
+    public boolean validateServiceTypeRealizations( ServiceTypeRealizations serviceTypeRealizations,
             DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tServiceTypeRealizations, diagnostics, context );
+        return validate_EveryDefaultConstraint( serviceTypeRealizations, diagnostics, context );
     }
 
     /**
@@ -764,9 +706,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTSubDataAttribute( TSubDataAttribute tSubDataAttribute, DiagnosticChain diagnostics,
+    public boolean validateSubDataAttribute( SubDataAttribute subDataAttribute, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tSubDataAttribute, diagnostics, context );
+        return validate_EveryDefaultConstraint( subDataAttribute, diagnostics, context );
     }
 
     /**
@@ -774,9 +716,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTSubDataObject( TSubDataObject tSubDataObject, DiagnosticChain diagnostics,
+    public boolean validateSubDataObject( SubDataObject subDataObject, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tSubDataObject, diagnostics, context );
+        return validate_EveryDefaultConstraint( subDataObject, diagnostics, context );
     }
 
     /**
@@ -784,9 +726,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTTitledClass( TTitledClass tTitledClass, DiagnosticChain diagnostics,
+    public boolean validateTitledClass( TitledClass titledClass, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return validate_EveryDefaultConstraint( tTitledClass, diagnostics, context );
+        return validate_EveryDefaultConstraint( titledClass, diagnostics, context );
     }
 
     /**
@@ -794,28 +736,10 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTACSIServicesKind( TACSIServicesKind tacsiServicesKind, DiagnosticChain diagnostics,
+    public boolean validateNSDObjectWithVersionAndRelease(
+            NSDObjectWithVersionAndRelease nsdObjectWithVersionAndRelease, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        return true;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTCBKind( TCBKind tcbKind, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return true;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTDefinedAttributeTypeKind( TDefinedAttributeTypeKind tDefinedAttributeTypeKind,
-            DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        return true;
+        return validate_EveryDefaultConstraint( nsdObjectWithVersionAndRelease, diagnostics, context );
     }
 
     /**
@@ -823,7 +747,7 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTLicenseKind( TLicenseKind tLicenseKind, DiagnosticChain diagnostics,
+    public boolean validateACSIServicesKind( ACSIServicesKind acsiServicesKind, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
         return true;
     }
@@ -833,8 +757,7 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTPubStage( TPubStage tPubStage, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
+    public boolean validateCBKind( CBKind cbKind, DiagnosticChain diagnostics, Map< Object, Object > context ) {
         return true;
     }
 
@@ -843,7 +766,7 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTUndefinedAttributeTypeKind( TUndefinedAttributeTypeKind tUndefinedAttributeTypeKind,
+    public boolean validateDefinedAttributeTypeKind( DefinedAttributeTypeKind definedAttributeTypeKind,
             DiagnosticChain diagnostics, Map< Object, Object > context ) {
         return true;
     }
@@ -853,7 +776,7 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTAbbreviationName( String tAbbreviationName, DiagnosticChain diagnostics,
+    public boolean validateLicenseKind( LicenseKind licenseKind, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
         return true;
     }
@@ -863,12 +786,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTAbstractLNClassName( String tAbstractLNClassName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTIec61850Name_Pattern( tAbstractLNClassName, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= validateTIec61850Name_MinLength( tAbstractLNClassName, diagnostics, context );
-        return result;
+    public boolean validatePubStage( PubStage pubStage, DiagnosticChain diagnostics, Map< Object, Object > context ) {
+        return true;
     }
 
     /**
@@ -876,7 +795,7 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTACSIServicesKindObject( TACSIServicesKind tacsiServicesKindObject,
+    public boolean validateUndefinedAttributeTypeKind( UndefinedAttributeTypeKind undefinedAttributeTypeKind,
             DiagnosticChain diagnostics, Map< Object, Object > context ) {
         return true;
     }
@@ -886,12 +805,9 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTAttributeName( String tAttributeName, DiagnosticChain diagnostics,
+    public boolean validateACSIServicesKindObject( ACSIServicesKind acsiServicesKindObject, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        boolean result = validateTIec61850Name_Pattern( tAttributeName, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= validateTIec61850Name_MinLength( tAttributeName, diagnostics, context );
-        return result;
+        return true;
     }
 
     /**
@@ -899,29 +815,29 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTAttributeTypeKind( Enumerator tAttributeTypeKind, DiagnosticChain diagnostics,
+    public boolean validateAttributeTypeKind( Enumerator attributeTypeKind, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
-        boolean result = validateTAttributeTypeKind_MemberTypes( tAttributeTypeKind, diagnostics, context );
+        boolean result = validateAttributeTypeKind_MemberTypes( attributeTypeKind, diagnostics, context );
         return result;
     }
 
     /**
-     * Validates the MemberTypes constraint of '<em>TAttribute Type Kind</em>'.
+     * Validates the MemberTypes constraint of '<em>Attribute Type Kind</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTAttributeTypeKind_MemberTypes( Enumerator tAttributeTypeKind, DiagnosticChain diagnostics,
+    public boolean validateAttributeTypeKind_MemberTypes( Enumerator attributeTypeKind, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
         if( diagnostics != null ) {
             BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
-            if( NsdPackage.Literals.TDEFINED_ATTRIBUTE_TYPE_KIND.isInstance( tAttributeTypeKind ) ) {
-                if( validateTDefinedAttributeTypeKind( ( TDefinedAttributeTypeKind ) tAttributeTypeKind,
-                        tempDiagnostics, context ) )
+            if( NsdPackage.Literals.DEFINED_ATTRIBUTE_TYPE_KIND.isInstance( attributeTypeKind ) ) {
+                if( validateDefinedAttributeTypeKind( ( DefinedAttributeTypeKind ) attributeTypeKind, tempDiagnostics,
+                        context ) )
                     return true;
             }
-            if( NsdPackage.Literals.TUNDEFINED_ATTRIBUTE_TYPE_KIND.isInstance( tAttributeTypeKind ) ) {
-                if( validateTUndefinedAttributeTypeKind( ( TUndefinedAttributeTypeKind ) tAttributeTypeKind,
+            if( NsdPackage.Literals.UNDEFINED_ATTRIBUTE_TYPE_KIND.isInstance( attributeTypeKind ) ) {
+                if( validateUndefinedAttributeTypeKind( ( UndefinedAttributeTypeKind ) attributeTypeKind,
                         tempDiagnostics, context ) )
                     return true;
             }
@@ -930,13 +846,12 @@ public class NsdValidator extends EObjectValidator {
             }
         }
         else {
-            if( NsdPackage.Literals.TDEFINED_ATTRIBUTE_TYPE_KIND.isInstance( tAttributeTypeKind ) ) {
-                if( validateTDefinedAttributeTypeKind( ( TDefinedAttributeTypeKind ) tAttributeTypeKind, null,
-                        context ) )
+            if( NsdPackage.Literals.DEFINED_ATTRIBUTE_TYPE_KIND.isInstance( attributeTypeKind ) ) {
+                if( validateDefinedAttributeTypeKind( ( DefinedAttributeTypeKind ) attributeTypeKind, null, context ) )
                     return true;
             }
-            if( NsdPackage.Literals.TUNDEFINED_ATTRIBUTE_TYPE_KIND.isInstance( tAttributeTypeKind ) ) {
-                if( validateTUndefinedAttributeTypeKind( ( TUndefinedAttributeTypeKind ) tAttributeTypeKind, null,
+            if( NsdPackage.Literals.UNDEFINED_ATTRIBUTE_TYPE_KIND.isInstance( attributeTypeKind ) ) {
+                if( validateUndefinedAttributeTypeKind( ( UndefinedAttributeTypeKind ) attributeTypeKind, null,
                         context ) )
                     return true;
             }
@@ -949,33 +864,7 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTBasicTypeName( String tBasicTypeName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTBasicTypeName_MinLength( tBasicTypeName, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * Validates the MinLength constraint of '<em>TBasic Type Name</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTBasicTypeName_MinLength( String tBasicTypeName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tBasicTypeName.length();
-        boolean result = length >= 1;
-        if( !result && diagnostics != null ) reportMinLengthViolation( NsdPackage.Literals.TBASIC_TYPE_NAME,
-                tBasicTypeName, length, 1, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTCBKindObject( TCBKind tcbKindObject, DiagnosticChain diagnostics,
+    public boolean validateCBKindObject( CBKind cbKindObject, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
         return true;
     }
@@ -985,63 +874,7 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTCDCName( String tcdcName, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        boolean result = validateTIec61850Name_Pattern( tcdcName, diagnostics, context );
-        if( result || diagnostics != null ) result &= validateTCDCName_MinLength( tcdcName, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * Validates the MinLength constraint of '<em>TCDC Name</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTCDCName_MinLength( String tcdcName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tcdcName.length();
-        boolean result = length >= 1;
-        if( !result && diagnostics != null )
-            reportMinLengthViolation( NsdPackage.Literals.TCDC_NAME, tcdcName, length, 1, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTDataObjectName( String tDataObjectName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTIec61850Name_Pattern( tDataObjectName, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= validateTIec61850Name_MinLength( tDataObjectName, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= validateTDataObjectName_MaxLength( tDataObjectName, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * Validates the MaxLength constraint of '<em>TData Object Name</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTDataObjectName_MaxLength( String tDataObjectName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tDataObjectName.length();
-        boolean result = length <= 12;
-        if( !result && diagnostics != null ) reportMaxLengthViolation( NsdPackage.Literals.TDATA_OBJECT_NAME,
-                tDataObjectName, length, 12, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTDefinedAttributeTypeKindObject( TDefinedAttributeTypeKind tDefinedAttributeTypeKindObject,
+    public boolean validateDefinedAttributeTypeKindObject( DefinedAttributeTypeKind definedAttributeTypeKindObject,
             DiagnosticChain diagnostics, Map< Object, Object > context ) {
         return true;
     }
@@ -1051,488 +884,7 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTDocID( String tDocID, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        boolean result = validateTDocID_MinLength( tDocID, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * Validates the MinLength constraint of '<em>TDoc ID</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTDocID_MinLength( String tDocID, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tDocID.length();
-        boolean result = length >= 1;
-        if( !result && diagnostics != null )
-            reportMinLengthViolation( NsdPackage.Literals.TDOC_ID, tDocID, length, 1, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTEmptyString( String tEmptyString, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTEmptyString_MaxLength( tEmptyString, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * Validates the MaxLength constraint of '<em>TEmpty String</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTEmptyString_MaxLength( String tEmptyString, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tEmptyString.length();
-        boolean result = length <= 0;
-        if( !result && diagnostics != null ) reportMaxLengthViolation( NsdPackage.Literals.TEMPTY_STRING, tEmptyString,
-                length, 0, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTFCAbbreviation( String tfcAbbreviation, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTFCAbbreviation_Pattern( tfcAbbreviation, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= validateTFCAbbreviation_MinLength( tfcAbbreviation, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTFCAbbreviation_Pattern
-     */
-    public static final PatternMatcher[][] TFC_ABBREVIATION__PATTERN__VALUES = new PatternMatcher[][] {
-            new PatternMatcher[] { XMLTypeUtil.createPatternMatcher( "[\\p{IsBasicLatin}]+" ) } };
-
-    /**
-     * Validates the Pattern constraint of '<em>TFC Abbreviation</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTFCAbbreviation_Pattern( String tfcAbbreviation, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        return validatePattern( NsdPackage.Literals.TFC_ABBREVIATION, tfcAbbreviation,
-                TFC_ABBREVIATION__PATTERN__VALUES, diagnostics, context );
-    }
-
-    /**
-     * Validates the MinLength constraint of '<em>TFC Abbreviation</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTFCAbbreviation_MinLength( String tfcAbbreviation, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tfcAbbreviation.length();
-        boolean result = length >= 1;
-        if( !result && diagnostics != null ) reportMinLengthViolation( NsdPackage.Literals.TFC_ABBREVIATION,
-                tfcAbbreviation, length, 1, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTIec61850Name( String tIec61850Name, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTIec61850Name_Pattern( tIec61850Name, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= validateTIec61850Name_MinLength( tIec61850Name, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTIec61850Name_Pattern
-     */
-    public static final PatternMatcher[][] TIEC61850_NAME__PATTERN__VALUES = new PatternMatcher[][] {
-            new PatternMatcher[] { XMLTypeUtil.createPatternMatcher( "[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]+" ) },
-            new PatternMatcher[] { XMLTypeUtil.createPatternMatcher( "\\i\\c*" ) } };
-
-    /**
-     * Validates the Pattern constraint of '<em>TIec61850 Name</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTIec61850Name_Pattern( String tIec61850Name, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        return validatePattern( NsdPackage.Literals.TIEC61850_NAME, tIec61850Name, TIEC61850_NAME__PATTERN__VALUES,
-                diagnostics, context );
-    }
-
-    /**
-     * Validates the MinLength constraint of '<em>TIec61850 Name</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTIec61850Name_MinLength( String tIec61850Name, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tIec61850Name.length();
-        boolean result = length >= 1;
-        if( !result && diagnostics != null ) reportMinLengthViolation( NsdPackage.Literals.TIEC61850_NAME,
-                tIec61850Name, length, 1, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTIec61850NameString( String tIec61850NameString, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTIec61850NameString_Pattern( tIec61850NameString, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTIec61850NameString_Pattern
-     */
-    public static final PatternMatcher[][] TIEC61850_NAME_STRING__PATTERN__VALUES = new PatternMatcher[][] {
-            new PatternMatcher[] {
-                    XMLTypeUtil.createPatternMatcher( "[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]+" ) } };
-
-    /**
-     * Validates the Pattern constraint of '<em>TIec61850 Name String</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTIec61850NameString_Pattern( String tIec61850NameString, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        return validatePattern( NsdPackage.Literals.TIEC61850_NAME_STRING, tIec61850NameString,
-                TIEC61850_NAME_STRING__PATTERN__VALUES, diagnostics, context );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTissuesType( String tissuesType, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTissuesType_MinLength( tissuesType, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * Validates the MinLength constraint of '<em>Tissues Type</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTissuesType_MinLength( String tissuesType, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tissuesType.length();
-        boolean result = length >= 1;
-        if( !result && diagnostics != null )
-            reportMinLengthViolation( NsdPackage.Literals.TISSUES_TYPE, tissuesType, length, 1, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTLicenseKindObject( TLicenseKind tLicenseKindObject, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        return true;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTLiteralName( String tLiteralName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTLiteralName_Pattern( tLiteralName, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= validateTLiteralName_MaxLength( tLiteralName, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTLiteralName_Pattern
-     */
-    public static final PatternMatcher[][] TLITERAL_NAME__PATTERN__VALUES = new PatternMatcher[][] {
-            new PatternMatcher[] {
-                    XMLTypeUtil.createPatternMatcher( "[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]*" ) } };
-
-    /**
-     * Validates the Pattern constraint of '<em>TLiteral Name</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTLiteralName_Pattern( String tLiteralName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        return validatePattern( NsdPackage.Literals.TLITERAL_NAME, tLiteralName, TLITERAL_NAME__PATTERN__VALUES,
-                diagnostics, context );
-    }
-
-    /**
-     * Validates the MaxLength constraint of '<em>TLiteral Name</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTLiteralName_MaxLength( String tLiteralName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tLiteralName.length();
-        boolean result = length <= 127;
-        if( !result && diagnostics != null ) reportMaxLengthViolation( NsdPackage.Literals.TLITERAL_NAME, tLiteralName,
-                length, 127, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTLNClassName( String tlnClassName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTLNClassName_Pattern( tlnClassName, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTLNClassName_Pattern
-     */
-    public static final PatternMatcher[][] TLN_CLASS_NAME__PATTERN__VALUES = new PatternMatcher[][] {
-            new PatternMatcher[] { XMLTypeUtil.createPatternMatcher( "LLN0" ),
-                    XMLTypeUtil.createPatternMatcher( "[A-Z]{4}" ) },
-            new PatternMatcher[] { XMLTypeUtil.createPatternMatcher( "\\i\\c*" ) } };
-
-    /**
-     * Validates the Pattern constraint of '<em>TLN Class Name</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTLNClassName_Pattern( String tlnClassName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        return validatePattern( NsdPackage.Literals.TLN_CLASS_NAME, tlnClassName, TLN_CLASS_NAME__PATTERN__VALUES,
-                diagnostics, context );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSIdentifier( String tnsIdentifier, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTNSIdentifier_Pattern( tnsIdentifier, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTNSIdentifier_Pattern
-     */
-    public static final PatternMatcher[][] TNS_IDENTIFIER__PATTERN__VALUES = new PatternMatcher[][] {
-            new PatternMatcher[] { XMLTypeUtil.createPatternMatcher( "\\p{IsBasicLatin}+" ) } };
-
-    /**
-     * Validates the Pattern constraint of '<em>TNS Identifier</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSIdentifier_Pattern( String tnsIdentifier, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        return validatePattern( NsdPackage.Literals.TNS_IDENTIFIER, tnsIdentifier, TNS_IDENTIFIER__PATTERN__VALUES,
-                diagnostics, context );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSRelease( short tnsRelease, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        boolean result = validateTNSRelease_Min( tnsRelease, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= xmlTypeValidator.validateUnsignedByte_Max( tnsRelease, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTNSRelease_Min
-     */
-    public static final short TNS_RELEASE__MIN__VALUE = 0;
-
-    /**
-     * Validates the Min constraint of '<em>TNS Release</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSRelease_Min( short tnsRelease, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = tnsRelease > TNS_RELEASE__MIN__VALUE;
-        if( !result && diagnostics != null ) reportMinViolation( NsdPackage.Literals.TNS_RELEASE, tnsRelease,
-                TNS_RELEASE__MIN__VALUE, false, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSReleaseObject( Short tnsReleaseObject, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTNSRelease_Min( tnsReleaseObject, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= xmlTypeValidator.validateUnsignedByte_Max( tnsReleaseObject, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSRevision( String tnsRevision, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTNSRevision_Pattern( tnsRevision, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTNSRevision_Pattern
-     */
-    public static final PatternMatcher[][] TNS_REVISION__PATTERN__VALUES = new PatternMatcher[][] {
-            new PatternMatcher[] { XMLTypeUtil.createPatternMatcher( "[A-Z]" ) } };
-
-    /**
-     * Validates the Pattern constraint of '<em>TNS Revision</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSRevision_Pattern( String tnsRevision, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        return validatePattern( NsdPackage.Literals.TNS_REVISION, tnsRevision, TNS_REVISION__PATTERN__VALUES,
-                diagnostics, context );
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSVersion( int tnsVersion, DiagnosticChain diagnostics, Map< Object, Object > context ) {
-        boolean result = validateTNSVersion_Min( tnsVersion, diagnostics, context );
-        if( result || diagnostics != null ) result &= validateTNSVersion_Max( tnsVersion, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTNSVersion_Min
-     */
-    public static final int TNS_VERSION__MIN__VALUE = 2002;
-
-    /**
-     * Validates the Min constraint of '<em>TNS Version</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSVersion_Min( int tnsVersion, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = tnsVersion >= TNS_VERSION__MIN__VALUE;
-        if( !result && diagnostics != null ) reportMinViolation( NsdPackage.Literals.TNS_VERSION, tnsVersion,
-                TNS_VERSION__MIN__VALUE, true, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @see #validateTNSVersion_Max
-     */
-    public static final int TNS_VERSION__MAX__VALUE = 2099;
-
-    /**
-     * Validates the Max constraint of '<em>TNS Version</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSVersion_Max( int tnsVersion, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = tnsVersion <= TNS_VERSION__MAX__VALUE;
-        if( !result && diagnostics != null ) reportMaxViolation( NsdPackage.Literals.TNS_VERSION, tnsVersion,
-                TNS_VERSION__MAX__VALUE, true, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTNSVersionObject( Integer tnsVersionObject, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTNSVersion_Min( tnsVersionObject, diagnostics, context );
-        if( result || diagnostics != null ) result &= validateTNSVersion_Max( tnsVersionObject, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTPresenceConditionArgument( String tPresenceConditionArgument, DiagnosticChain diagnostics,
+    public boolean validateLicenseKindObject( LicenseKind licenseKindObject, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
         return true;
     }
@@ -1542,7 +894,7 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTPresenceConditionName( String tPresenceConditionName, DiagnosticChain diagnostics,
+    public boolean validatePubStageObject( PubStage pubStageObject, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
         return true;
     }
@@ -1552,59 +904,8 @@ public class NsdValidator extends EObjectValidator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public boolean validateTPubStageObject( TPubStage tPubStageObject, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        return true;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTSubDataObjectName( String tSubDataObjectName, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = validateTIec61850Name_Pattern( tSubDataObjectName, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= validateTIec61850Name_MinLength( tSubDataObjectName, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTUMLVersion( String tumlVersion, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        boolean result = xmlTypeValidator.validateName_Pattern( tumlVersion, diagnostics, context );
-        if( result || diagnostics != null )
-            result &= validateTUMLVersion_MinLength( tumlVersion, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * Validates the MinLength constraint of '<em>TUML Version</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTUMLVersion_MinLength( String tumlVersion, DiagnosticChain diagnostics,
-            Map< Object, Object > context ) {
-        int length = tumlVersion.length();
-        boolean result = length >= 1;
-        if( !result && diagnostics != null )
-            reportMinLengthViolation( NsdPackage.Literals.TUML_VERSION, tumlVersion, length, 1, diagnostics, context );
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean validateTUndefinedAttributeTypeKindObject(
-            TUndefinedAttributeTypeKind tUndefinedAttributeTypeKindObject, DiagnosticChain diagnostics,
+    public boolean validateUndefinedAttributeTypeKindObject(
+            UndefinedAttributeTypeKind undefinedAttributeTypeKindObject, DiagnosticChain diagnostics,
             Map< Object, Object > context ) {
         return true;
     }