Bug 509084: [Importer][Rhapsody] refactore umlrhapsody metamodel to get a common ancestor for the feature displayName

1/ we remove the feature displayName of all these elements : - ITriggered - ITransition - ITag - ISwimlane - IStereotype - IActivityGraph - IActor - ISubsystem - IState - IRequirement - IProfile - IPrimitiveOperation - IPar - IMessage - IMHyperLink - IEvent - IDiagram - IDependency - IClassifierRole - IClass - IActivityGraph 2/ We add the feature display name to IModelElement object 3/ We add the inheritance to IModelElement for these objects: - ITriggered - IActivityGraph - ISubsystem - IPrimitiveOperation - IMHyperLink (done in its superclass HyperLinksType) Change-Id: Id8d70680436c6f227f618ad34e6d87fe697edb67 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
author: Vincent Lorenzo 2016-12-12 14:47:01 +0000
committer: vincent lorenzo 2016-12-13 09:14:45 +0000
commit: 1db6463733535d760b4282468648f6ef3e3d721a (patch)
tree: 5dbf33330d7f82d50324f44c048685f890bfb648 /extraplugins
parent: 15ff1578395d0d476453e80ca0082ccda46bb8da (diff)
download: org.eclipse.papyrus-1db6463733535d760b4282468648f6ef3e3d721a.tar.gz
org.eclipse.papyrus-1db6463733535d760b4282468648f6ef3e3d721a.tar.xz
org.eclipse.papyrus-1db6463733535d760b4282468648f6ef3e3d721a.zip
184 files changed, 2220 insertions, 2844 deletions
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IActivityGraph.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IActivityGraph.gif
new file mode 100755
index 00000000000..7e2fd2ea3bd
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IActivityGraph.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IExternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IExternalHyperlink.gif
new file mode 100755
index 00000000000..39428c713a1
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IExternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IInternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IInternalHyperlink.gif
new file mode 100755
index 00000000000..d19385ddf84
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IInternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IMHyperLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IMHyperLink.gif
new file mode 100755
index 00000000000..f69592cd356
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IMHyperLink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IPart.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IPart.gif
new file mode 100755
index 00000000000..f7a9c9fcf52
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IPart.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IPrimitiveOperation.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IPrimitiveOperation.gif
new file mode 100755
index 00000000000..3ca8bfa99ea
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_IPrimitiveOperation.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_ISubsystem.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_ISubsystem.gif
new file mode 100755
index 00000000000..12536cb884c
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_ISubsystem.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_ITriggered.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_ITriggered.gif
new file mode 100755
index 00000000000..3473a1ffdd0
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIClass_Inheritances_ITriggered.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IActivityGraph.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IActivityGraph.gif
new file mode 100755
index 00000000000..7e829ad2e4a
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IActivityGraph.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IExternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IExternalHyperlink.gif
new file mode 100755
index 00000000000..1b954c54bf0
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IExternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IInternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IInternalHyperlink.gif
new file mode 100755
index 00000000000..c345ca5a1bf
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IInternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IMHyperLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IMHyperLink.gif
new file mode 100755
index 00000000000..014b83a419e
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IMHyperLink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IPart.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IPart.gif
new file mode 100755
index 00000000000..1c8ac08b762
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IPart.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IPrimitiveOperation.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IPrimitiveOperation.gif
new file mode 100755
index 00000000000..1826517dd72
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_IPrimitiveOperation.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_ISubsystem.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_ISubsystem.gif
new file mode 100755
index 00000000000..e66386f5ea2
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_ISubsystem.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_ITriggered.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_ITriggered.gif
new file mode 100755
index 00000000000..16048d0b3f3
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIDiagram_Stereotypes_ITriggered.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IActivityGraph.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IActivityGraph.gif
new file mode 100755
index 00000000000..ebfad0fb2c9
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IActivityGraph.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IExternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IExternalHyperlink.gif
new file mode 100755
index 00000000000..35f2a356e21
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IExternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IInternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IInternalHyperlink.gif
new file mode 100755
index 00000000000..6b2c3eb3147
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IInternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IMHyperLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IMHyperLink.gif
new file mode 100755
index 00000000000..3d60257cc2d
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IMHyperLink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IPart.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IPart.gif
new file mode 100755
index 00000000000..72187d35556
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IPart.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IPrimitiveOperation.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IPrimitiveOperation.gif
new file mode 100755
index 00000000000..532e1b63464
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_IPrimitiveOperation.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_ISubsystem.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_ISubsystem.gif
new file mode 100755
index 00000000000..5ae88336cad
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_ISubsystem.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_ITriggered.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_ITriggered.gif
new file mode 100755
index 00000000000..b5cf7e3d2f7
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIFile_Fragments_ITriggered.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IActivityGraph.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IActivityGraph.gif
new file mode 100755
index 00000000000..f3d7cb9885a
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IActivityGraph.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IExternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IExternalHyperlink.gif
new file mode 100755
index 00000000000..9f3b2e7c109
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IExternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IInternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IInternalHyperlink.gif
new file mode 100755
index 00000000000..df3eebc9432
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IInternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IMHyperLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IMHyperLink.gif
new file mode 100755
index 00000000000..55473b48dce
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IMHyperLink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IPart.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IPart.gif
new file mode 100755
index 00000000000..f2db288b850
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IPart.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IPrimitiveOperation.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IPrimitiveOperation.gif
new file mode 100755
index 00000000000..ed645c34d5a
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_IPrimitiveOperation.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_ISubsystem.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_ISubsystem.gif
new file mode 100755
index 00000000000..3b598dbe2b3
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_ISubsystem.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_ITriggered.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_ITriggered.gif
new file mode 100755
index 00000000000..3ede289a77e
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Components_ITriggered.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IActivityGraph.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IActivityGraph.gif
new file mode 100755
index 00000000000..f3d7cb9885a
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IActivityGraph.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IExternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IExternalHyperlink.gif
new file mode 100755
index 00000000000..9f3b2e7c109
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IExternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IInternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IInternalHyperlink.gif
new file mode 100755
index 00000000000..df3eebc9432
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IInternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IMHyperLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IMHyperLink.gif
new file mode 100755
index 00000000000..55473b48dce
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IMHyperLink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IPart.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IPart.gif
new file mode 100755
index 00000000000..f2db288b850
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IPart.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IPrimitiveOperation.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IPrimitiveOperation.gif
new file mode 100755
index 00000000000..ed645c34d5a
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_IPrimitiveOperation.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_ISubsystem.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_ISubsystem.gif
new file mode 100755
index 00000000000..3b598dbe2b3
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_ISubsystem.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_ITriggered.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_ITriggered.gif
new file mode 100755
index 00000000000..3ede289a77e
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIProject_Diagrams_ITriggered.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IActivityGraph.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IActivityGraph.gif
new file mode 100755
index 00000000000..e3a33e1908c
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IActivityGraph.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IExternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IExternalHyperlink.gif
new file mode 100755
index 00000000000..f2cd14df6ec
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IExternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IInternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IInternalHyperlink.gif
new file mode 100755
index 00000000000..f4e0f08f73f
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IInternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IMHyperLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IMHyperLink.gif
new file mode 100755
index 00000000000..b5d9dfa2bb4
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IMHyperLink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IPart.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IPart.gif
new file mode 100755
index 00000000000..4047eaa2da6
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IPart.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IPrimitiveOperation.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IPrimitiveOperation.gif
new file mode 100755
index 00000000000..31a5cbb854a
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_IPrimitiveOperation.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_ISubsystem.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_ISubsystem.gif
new file mode 100755
index 00000000000..dd1ad844214
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_ISubsystem.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_ITriggered.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_ITriggered.gif
new file mode 100755
index 00000000000..17408b8fb4f
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateIState_entryAction_ITriggered.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IActivityGraph.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IActivityGraph.gif
new file mode 100755
index 00000000000..b52b0e49a6b
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IActivityGraph.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IExternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IExternalHyperlink.gif
new file mode 100755
index 00000000000..497cf8697ce
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IExternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IInternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IInternalHyperlink.gif
new file mode 100755
index 00000000000..2ef0042540d
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IInternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IMHyperLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IMHyperLink.gif
new file mode 100755
index 00000000000..0217157fa07
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IMHyperLink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IPart.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IPart.gif
new file mode 100755
index 00000000000..8e2a3260f9c
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IPart.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IPrimitiveOperation.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IPrimitiveOperation.gif
new file mode 100755
index 00000000000..62f7a1e061c
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_IPrimitiveOperation.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_ISubsystem.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_ISubsystem.gif
new file mode 100755
index 00000000000..67b924c67cf
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_ISubsystem.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_ITriggered.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_ITriggered.gif
new file mode 100755
index 00000000000..43d93ae5094
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateISubsystem_TableLayouts_ITriggered.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IActivityGraph.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IActivityGraph.gif
new file mode 100755
index 00000000000..53a350e53a2
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IActivityGraph.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IExternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IExternalHyperlink.gif
new file mode 100755
index 00000000000..d56a04bddf1
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IExternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IInternalHyperlink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IInternalHyperlink.gif
new file mode 100755
index 00000000000..8f0a0b2b5bd
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IInternalHyperlink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IMHyperLink.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IMHyperLink.gif
new file mode 100755
index 00000000000..4937a9c8b59
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IMHyperLink.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IPart.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IPart.gif
new file mode 100755
index 00000000000..3b60193b43c
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IPart.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IPrimitiveOperation.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IPrimitiveOperation.gif
new file mode 100755
index 00000000000..5f4cee688a5
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_IPrimitiveOperation.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_ISubsystem.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_ISubsystem.gif
new file mode 100755
index 00000000000..9a73c8d2dbc
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_ISubsystem.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_ITriggered.gif b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_ITriggered.gif
new file mode 100755
index 00000000000..a785c69abc6
--- /dev/null
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/icons/full/ctool16/CreateITag_ValueSpecifications_ITriggered.gif
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/plugin.properties b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/plugin.properties
index 60d00c2c8df..71cdbe97bdf 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/plugin.properties
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/plugin.properties
@@ -2013,3 +2013,4 @@ _UI_FromLinkType_type = From Link Type
 _UI_M_pRootType_type = MpRoot Type
 _UI_CGIPortConnector_m_nAngle_feature = MnAngle
 _UI_IProject_version_feature = Version
+_UI_IModelElement_displayName_feature = Display Name
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/HyperLinksTypeItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/HyperLinksTypeItemProvider.java
index bb41de9d2b3..759e3216218 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/HyperLinksTypeItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/HyperLinksTypeItemProvider.java
@@ -18,16 +18,8 @@ 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.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.papyrus.migration.rhapsody.rhapsodymetamodel.HyperLinksType;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.HyperLinksType} object.
@@ -36,13 +28,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
  * @generated
  */
 public class HyperLinksTypeItemProvider 
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends IModelElementItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -76,7 +62,10 @@ public class HyperLinksTypeItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_HyperLinksType_type"); //$NON-NLS-1$
+		String label = ((HyperLinksType)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_HyperLinksType_type") : //$NON-NLS-1$
+			getString("_UI_HyperLinksType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
@@ -105,15 +94,4 @@ public class HyperLinksTypeItemProvider
 		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 rhapsodymetamodelEditPlugin.INSTANCE;
-	}
-
 }
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAcceptEventActionItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAcceptEventActionItemProvider.java
index 11a70b82a8b..bbf86a2d556 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAcceptEventActionItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAcceptEventActionItemProvider.java
@@ -145,9 +145,9 @@ public class IAcceptEventActionItemProvider extends IStateItemProvider {
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_ExitAction() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Annotations() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAcceptTimeEventItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAcceptTimeEventItemProvider.java
index e34648fd444..cd7f2497145 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAcceptTimeEventItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAcceptTimeEventItemProvider.java
@@ -121,9 +121,9 @@ public class IAcceptTimeEventItemProvider extends IStateItemProvider {
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_ExitAction() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Annotations() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IActionItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IActionItemProvider.java
index 4308a280b27..c2a21bd2d0c 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IActionItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IActionItemProvider.java
@@ -216,7 +216,7 @@ public class IActionItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((IAction)object).getId();
+		String label = ((IAction)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_IAction_type") : //$NON-NLS-1$
 			getString("_UI_IAction_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IActivityGraphItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IActivityGraphItemProvider.java
index 7a6d4289cff..ce08b1be722 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IActivityGraphItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IActivityGraphItemProvider.java
@@ -62,6 +62,7 @@ public class IActivityGraphItemProvider extends NestedStateChartTypeItemProvider
 			addIdPropertyDescriptor(object);
 			addMyStatePropertyDescriptor(object);
 			addNamePropertyDescriptor(object);
+			addDisplayNamePropertyDescriptor(object);
 			addLastIDPropertyDescriptor(object);
 			addWeakCGTimePropertyDescriptor(object);
 			addStrongCGTimePropertyDescriptor(object);
@@ -75,7 +76,6 @@ public class IActivityGraphItemProvider extends NestedStateChartTypeItemProvider
 			addCodeUpdateCGTimePropertyDescriptor(object);
 			addObjectCreationPropertyDescriptor(object);
 			addUmlDependencyIDPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addTheMainDiagramPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -466,9 +466,9 @@ public class IActivityGraphItemProvider extends NestedStateChartTypeItemProvider
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_IActivityGraph_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IActivityGraph_displayName_feature", "_UI_IActivityGraph_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIActivityGraph_DisplayName(),
+				 getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(),
 				 true,
 				 false,
 				 false,
@@ -581,6 +581,7 @@ public class IActivityGraphItemProvider extends NestedStateChartTypeItemProvider
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__ID:
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__MY_STATE:
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__NAME:
+			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__LAST_ID:
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__WEAK_CG_TIME:
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__STRONG_CG_TIME:
@@ -592,7 +593,6 @@ public class IActivityGraphItemProvider extends NestedStateChartTypeItemProvider
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__CODE_UPDATE_CG_TIME:
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__OBJECT_CREATION:
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__UML_DEPENDENCY_ID:
-			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__STATES:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAnnotationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAnnotationItemProvider.java
index 95c3a476d44..3dbea50af3a 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAnnotationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAnnotationItemProvider.java
@@ -204,7 +204,7 @@ public class IAnnotationItemProvider extends IUnitItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((IAnnotation)object).getRequiremenTracabilityHandle();
+		String label = ((IAnnotation)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_IAnnotation_type") : //$NON-NLS-1$
 			getString("_UI_IAnnotation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAssociationClassItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAssociationClassItemProvider.java
index 423e28b9041..8089ca7d676 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAssociationClassItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IAssociationClassItemProvider.java
@@ -134,7 +134,8 @@ public class IAssociationClassItemProvider extends IClassItemProvider {
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_TemplateParameters() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Operations() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_PrimitiveOperations() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Dependencies();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Dependencies() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICallOperationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICallOperationItemProvider.java
index 2dab08cff6c..9fcf7f14b8f 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICallOperationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICallOperationItemProvider.java
@@ -168,9 +168,9 @@ public class ICallOperationItemProvider extends IStateItemProvider {
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_ExitAction() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Annotations() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassItemProvider.java
index 8bc153ec065..cfaeaf67ddc 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassItemProvider.java
@@ -78,7 +78,6 @@ public class IClassItemProvider extends IClassifierItemProvider {
 			addRequiremenTracabilityHandlePropertyDescriptor(object);
 			addCodeUpdateCGTimePropertyDescriptor(object);
 			addCmheaderPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -524,28 +523,6 @@ public class IClassItemProvider extends IClassifierItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IClass_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IClass_displayName_feature", "_UI_IClass_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIClass_DisplayName(),
-				 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}.
@@ -647,7 +624,6 @@ public class IClassItemProvider extends IClassifierItemProvider {
 			case UMLRhapsodyPackage.ICLASS__REQUIREMEN_TRACABILITY_HANDLE:
 			case UMLRhapsodyPackage.ICLASS__CODE_UPDATE_CG_TIME:
 			case UMLRhapsodyPackage.ICLASS__CMHEADER:
-			case UMLRhapsodyPackage.ICLASS__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.ICLASS__PROPERTIES:
@@ -1001,6 +977,11 @@ public class IClassItemProvider extends IClassifierItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
+				 UMLRhapsodyFactory.eINSTANCE.createIActivityGraph()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
 				 UMLRhapsodyFactory.eINSTANCE.createIUnit()));
 
 		newChildDescriptors.add
@@ -1161,6 +1142,11 @@ public class IClassItemProvider extends IClassifierItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
+				 UMLRhapsodyFactory.eINSTANCE.createIExternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
 				 UMLRhapsodyFactory.eINSTANCE.createIFile()));
 
 		newChildDescriptors.add
@@ -1236,6 +1222,11 @@ public class IClassItemProvider extends IClassifierItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
+				 UMLRhapsodyFactory.eINSTANCE.createIInternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
 				 UMLRhapsodyFactory.eINSTANCE.createILink()));
 
 		newChildDescriptors.add
@@ -1246,6 +1237,11 @@ public class IClassItemProvider extends IClassifierItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
+				 UMLRhapsodyFactory.eINSTANCE.createIMHyperLink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
 				 UMLRhapsodyFactory.eINSTANCE.createIMatrixLayout()));
 
 		newChildDescriptors.add
@@ -1301,6 +1297,11 @@ public class IClassItemProvider extends IClassifierItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPart()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
 				 UMLRhapsodyFactory.eINSTANCE.createIPin()));
 
 		newChildDescriptors.add
@@ -1311,6 +1312,11 @@ public class IClassItemProvider extends IClassifierItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPrimitiveOperation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
 				 UMLRhapsodyFactory.eINSTANCE.createIProfile()));
 
 		newChildDescriptors.add
@@ -1356,6 +1362,11 @@ public class IClassItemProvider extends IClassifierItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
+				 UMLRhapsodyFactory.eINSTANCE.createISubsystem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
 				 UMLRhapsodyFactory.eINSTANCE.createISwimlane()));
 
 		newChildDescriptors.add
@@ -1406,6 +1417,11 @@ public class IClassItemProvider extends IClassifierItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
+				 UMLRhapsodyFactory.eINSTANCE.createITriggered()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIClass_Inheritances(),
 				 UMLRhapsodyFactory.eINSTANCE.createIType()));
 
 		newChildDescriptors.add
@@ -2206,7 +2222,8 @@ public class IClassItemProvider extends IClassifierItemProvider {
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_TemplateParameters() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Operations() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_PrimitiveOperations() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Dependencies();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Dependencies() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassifierItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassifierItemProvider.java
index 1496ac7ec30..a3ee66ae838 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassifierItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassifierItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassifier;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassifier} object.
@@ -72,7 +73,10 @@ public class IClassifierItemProvider extends IUnitItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IClassifier_type"); //$NON-NLS-1$
+		String label = ((IClassifier)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IClassifier_type") : //$NON-NLS-1$
+			getString("_UI_IClassifier_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassifierRoleItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassifierRoleItemProvider.java
index 919edce6f06..3a65cd66bd9 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassifierRoleItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IClassifierRoleItemProvider.java
@@ -69,7 +69,6 @@ public class IClassifierRoleItemProvider extends IModelElementItemProvider {
 			addCodeUpdateCGTimePropertyDescriptor(object);
 			addObjectCreationPropertyDescriptor(object);
 			addUmlDependencyIDPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -317,28 +316,6 @@ public class IClassifierRoleItemProvider extends IModelElementItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IClassifierRole_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IClassifierRole_displayName_feature", "_UI_IClassifierRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIClassifierRole_DisplayName(),
-				 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}.
@@ -415,7 +392,6 @@ public class IClassifierRoleItemProvider extends IModelElementItemProvider {
 			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__CODE_UPDATE_CG_TIME:
 			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__OBJECT_CREATION:
 			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__UML_DEPENDENCY_ID:
-			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__PROPERTIES:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICollaborationDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICollaborationDiagramItemProvider.java
index 1332620d793..0d33a33b9da 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICollaborationDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICollaborationDiagramItemProvider.java
@@ -171,7 +171,8 @@ public class ICollaborationDiagramItemProvider extends IDiagramItemProvider {
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getICollaborationDiagram_M_pICollaboration();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getICollaborationDiagram_M_pICollaboration() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICollaborationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICollaborationItemProvider.java
index c81b05d3fe6..6335ab4c6fe 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICollaborationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ICollaborationItemProvider.java
@@ -210,7 +210,7 @@ public class ICollaborationItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ICollaboration)object).getId();
+		String label = ((ICollaboration)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_ICollaboration_type") : //$NON-NLS-1$
 			getString("_UI_ICollaboration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IComponentDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IComponentDiagramItemProvider.java
index 77b5e2b16de..6680833ba48 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IComponentDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IComponentDiagramItemProvider.java
@@ -120,7 +120,8 @@ public class IComponentDiagramItemProvider extends IDiagramItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IComponentInstanceItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IComponentInstanceItemProvider.java
index 23a9f05e554..7fcd15e9a71 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IComponentInstanceItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IComponentInstanceItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IComponentInstance;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IComponentInstance} object.
@@ -72,7 +73,10 @@ public class IComponentInstanceItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IComponentInstance_type"); //$NON-NLS-1$
+		String label = ((IComponentInstance)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IComponentInstance_type") : //$NON-NLS-1$
+			getString("_UI_IComponentInstance_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IConfigurationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IConfigurationItemProvider.java
index 2253e500858..6c85c2fae00 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IConfigurationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IConfigurationItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IConfiguration;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IConfiguration} object.
@@ -72,7 +73,10 @@ public class IConfigurationItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IConfiguration_type"); //$NON-NLS-1$
+		String label = ((IConfiguration)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IConfiguration_type") : //$NON-NLS-1$
+			getString("_UI_IConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IContextSpecificationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IContextSpecificationItemProvider.java
index 10c4a14250a..3afc02634a9 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IContextSpecificationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IContextSpecificationItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IContextSpecification;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IContextSpecification} object.
@@ -72,7 +73,10 @@ public class IContextSpecificationItemProvider extends IValueSpecificationItemPr
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IContextSpecification_type"); //$NON-NLS-1$
+		String label = ((IContextSpecification)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IContextSpecification_type") : //$NON-NLS-1$
+			getString("_UI_IContextSpecification_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IControlledFileItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IControlledFileItemProvider.java
index f6aaf9af44a..8a4ccb7e772 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IControlledFileItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IControlledFileItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IControlledFile;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IControlledFile} object.
@@ -72,7 +73,10 @@ public class IControlledFileItemProvider extends IUnitItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IControlledFile_type"); //$NON-NLS-1$
+		String label = ((IControlledFile)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IControlledFile_type") : //$NON-NLS-1$
+			getString("_UI_IControlledFile_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDependencyItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDependencyItemProvider.java
index e3d90f17303..ed02845b198 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDependencyItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDependencyItemProvider.java
@@ -65,7 +65,6 @@ public class IDependencyItemProvider extends IModelElementItemProvider {
 			addNamePropertyDescriptor(object);
 			addModifiedTimeWeakPropertyDescriptor(object);
 			addDependsOnPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addRequiremenTracabilityHandlePropertyDescriptor(object);
 			addCodeUpdateCGTimePropertyDescriptor(object);
 		}
@@ -227,28 +226,6 @@ public class IDependencyItemProvider extends IModelElementItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IDependency_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IDependency_displayName_feature", "_UI_IDependency_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIDependency_DisplayName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
 	 * This adds a property descriptor for the Requiremen Tracability Handle feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -371,7 +348,6 @@ public class IDependencyItemProvider extends IModelElementItemProvider {
 			case UMLRhapsodyPackage.IDEPENDENCY__MY_STATE:
 			case UMLRhapsodyPackage.IDEPENDENCY__NAME:
 			case UMLRhapsodyPackage.IDEPENDENCY__MODIFIED_TIME_WEAK:
-			case UMLRhapsodyPackage.IDEPENDENCY__DISPLAY_NAME:
 			case UMLRhapsodyPackage.IDEPENDENCY__REQUIREMEN_TRACABILITY_HANDLE:
 			case UMLRhapsodyPackage.IDEPENDENCY__CODE_UPDATE_CG_TIME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDeploymentDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDeploymentDiagramItemProvider.java
index 908a5b437b7..6e96c0e223d 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDeploymentDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDeploymentDiagramItemProvider.java
@@ -120,7 +120,8 @@ public class IDeploymentDiagramItemProvider extends IDiagramItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDiagramItemProvider.java
index 00a58c37a15..80990069c0e 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IDiagramItemProvider.java
@@ -70,7 +70,6 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 			addNamePropertyDescriptor(object);
 			addCmheaderPropertyDescriptor(object);
 			addModifiedTimeWeakPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addCodeUpdateCGTimePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -341,28 +340,6 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IDiagram_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IDiagram_displayName_feature", "_UI_IDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIDiagram_DisplayName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
 	 * This adds a property descriptor for the Code Update CG Time feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -467,7 +444,6 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 			case UMLRhapsodyPackage.IDIAGRAM__NAME:
 			case UMLRhapsodyPackage.IDIAGRAM__CMHEADER:
 			case UMLRhapsodyPackage.IDIAGRAM__MODIFIED_TIME_WEAK:
-			case UMLRhapsodyPackage.IDIAGRAM__DISPLAY_NAME:
 			case UMLRhapsodyPackage.IDIAGRAM__CODE_UPDATE_CG_TIME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
@@ -537,6 +513,11 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
+				 UMLRhapsodyFactory.eINSTANCE.createIActivityGraph()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
 				 UMLRhapsodyFactory.eINSTANCE.createIUnit()));
 
 		newChildDescriptors.add
@@ -697,6 +678,11 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
+				 UMLRhapsodyFactory.eINSTANCE.createIExternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
 				 UMLRhapsodyFactory.eINSTANCE.createIFile()));
 
 		newChildDescriptors.add
@@ -772,6 +758,11 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
+				 UMLRhapsodyFactory.eINSTANCE.createIInternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
 				 UMLRhapsodyFactory.eINSTANCE.createILink()));
 
 		newChildDescriptors.add
@@ -782,6 +773,11 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
+				 UMLRhapsodyFactory.eINSTANCE.createIMHyperLink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
 				 UMLRhapsodyFactory.eINSTANCE.createIMatrixLayout()));
 
 		newChildDescriptors.add
@@ -837,6 +833,11 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPart()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
 				 UMLRhapsodyFactory.eINSTANCE.createIPin()));
 
 		newChildDescriptors.add
@@ -847,6 +848,11 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPrimitiveOperation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
 				 UMLRhapsodyFactory.eINSTANCE.createIProfile()));
 
 		newChildDescriptors.add
@@ -892,6 +898,11 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
+				 UMLRhapsodyFactory.eINSTANCE.createISubsystem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
 				 UMLRhapsodyFactory.eINSTANCE.createISwimlane()));
 
 		newChildDescriptors.add
@@ -942,6 +953,11 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
+				 UMLRhapsodyFactory.eINSTANCE.createITriggered()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes(),
 				 UMLRhapsodyFactory.eINSTANCE.createIType()));
 
 		newChildDescriptors.add
@@ -1008,7 +1024,8 @@ public class IDiagramItemProvider extends IUnitItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IEventItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IEventItemProvider.java
index 781e3b9f55d..7a5b4b9cb01 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IEventItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IEventItemProvider.java
@@ -68,7 +68,6 @@ public class IEventItemProvider extends IInterfaceItemItemProvider {
 			addModifiedTimeWeakPropertyDescriptor(object);
 			addSuperEventPropertyDescriptor(object);
 			addRequiremenTracabilityHandlePropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -294,28 +293,6 @@ public class IEventItemProvider extends IInterfaceItemItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IEvent_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IEvent_displayName_feature", "_UI_IEvent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIEvent_DisplayName(),
-				 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}.
@@ -398,7 +375,6 @@ public class IEventItemProvider extends IInterfaceItemItemProvider {
 			case UMLRhapsodyPackage.IEVENT__VIRTUAL:
 			case UMLRhapsodyPackage.IEVENT__MODIFIED_TIME_WEAK:
 			case UMLRhapsodyPackage.IEVENT__REQUIREMEN_TRACABILITY_HANDLE:
-			case UMLRhapsodyPackage.IEVENT__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.IEVENT__ARGS:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IEventReceptionItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IEventReceptionItemProvider.java
index bf4afd22372..e2f48a0815d 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IEventReceptionItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IEventReceptionItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEventReception;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEventReception} object.
@@ -72,7 +73,10 @@ public class IEventReceptionItemProvider extends IInterfaceItemItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IEventReception_type"); //$NON-NLS-1$
+		String label = ((IEventReception)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IEventReception_type") : //$NON-NLS-1$
+			getString("_UI_IEventReception_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IExecutionOccurrenceItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IExecutionOccurrenceItemProvider.java
index bc7944a509f..f76459182fd 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IExecutionOccurrenceItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IExecutionOccurrenceItemProvider.java
@@ -170,7 +170,7 @@ public class IExecutionOccurrenceItemProvider extends IModelElementItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((IExecutionOccurrence)object).getId();
+		String label = ((IExecutionOccurrence)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_IExecutionOccurrence_type") : //$NON-NLS-1$
 			getString("_UI_IExecutionOccurrence_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IExternalHyperlinkItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IExternalHyperlinkItemProvider.java
index 153e9bed2c5..096a7c741a3 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IExternalHyperlinkItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IExternalHyperlinkItemProvider.java
@@ -101,7 +101,7 @@ public class IExternalHyperlinkItemProvider extends HyperLinksTypeItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((IExternalHyperlink)object).getTarget();
+		String label = ((IExternalHyperlink)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_IExternalHyperlink_type") : //$NON-NLS-1$
 			getString("_UI_IExternalHyperlink_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFileItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFileItemProvider.java
index 2ae5e34d0d4..a7b8ed6d5c8 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFileItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFileItemProvider.java
@@ -410,6 +410,11 @@ public class IFileItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
+				 UMLRhapsodyFactory.eINSTANCE.createIActivityGraph()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
 				 UMLRhapsodyFactory.eINSTANCE.createIUnit()));
 
 		newChildDescriptors.add
@@ -570,6 +575,11 @@ public class IFileItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
+				 UMLRhapsodyFactory.eINSTANCE.createIExternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
 				 UMLRhapsodyFactory.eINSTANCE.createIFile()));
 
 		newChildDescriptors.add
@@ -645,6 +655,11 @@ public class IFileItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
+				 UMLRhapsodyFactory.eINSTANCE.createIInternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
 				 UMLRhapsodyFactory.eINSTANCE.createILink()));
 
 		newChildDescriptors.add
@@ -655,6 +670,11 @@ public class IFileItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
+				 UMLRhapsodyFactory.eINSTANCE.createIMHyperLink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
 				 UMLRhapsodyFactory.eINSTANCE.createIMatrixLayout()));
 
 		newChildDescriptors.add
@@ -710,6 +730,11 @@ public class IFileItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPart()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
 				 UMLRhapsodyFactory.eINSTANCE.createIPin()));
 
 		newChildDescriptors.add
@@ -720,6 +745,11 @@ public class IFileItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPrimitiveOperation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
 				 UMLRhapsodyFactory.eINSTANCE.createIProfile()));
 
 		newChildDescriptors.add
@@ -765,6 +795,11 @@ public class IFileItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
+				 UMLRhapsodyFactory.eINSTANCE.createISubsystem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
 				 UMLRhapsodyFactory.eINSTANCE.createISwimlane()));
 
 		newChildDescriptors.add
@@ -815,6 +850,11 @@ public class IFileItemProvider extends IUnitItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
+				 UMLRhapsodyFactory.eINSTANCE.createITriggered()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIFile_Fragments(),
 				 UMLRhapsodyFactory.eINSTANCE.createIType()));
 
 		newChildDescriptors.add
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFlowItemItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFlowItemItemProvider.java
index 3a10728ea23..30e3f606ffc 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFlowItemItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFlowItemItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IFlowItem;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IFlowItem} object.
@@ -72,7 +73,10 @@ public class IFlowItemItemProvider extends IClassifierItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IFlowItem_type"); //$NON-NLS-1$
+		String label = ((IFlowItem)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IFlowItem_type") : //$NON-NLS-1$
+			getString("_UI_IFlowItem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFlowItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFlowItemProvider.java
index 97a1759be60..383d48f25f5 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFlowItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IFlowItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IFlow;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IFlow} object.
@@ -72,7 +73,10 @@ public class IFlowItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IFlow_type"); //$NON-NLS-1$
+		String label = ((IFlow)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IFlow_type") : //$NON-NLS-1$
+			getString("_UI_IFlow_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IGeneralizationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IGeneralizationItemProvider.java
index 6021e15436e..85eeb2167e4 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IGeneralizationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IGeneralizationItemProvider.java
@@ -275,7 +275,7 @@ public class IGeneralizationItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((IGeneralization)object).getId();
+		String label = ((IGeneralization)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_IGeneralization_type") : //$NON-NLS-1$
 			getString("_UI_IGeneralization_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IGuardItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IGuardItemProvider.java
index 156ed8efd24..896eb6e7f46 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IGuardItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IGuardItemProvider.java
@@ -193,7 +193,7 @@ public class IGuardItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((IGuard)object).getId();
+		String label = ((IGuard)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_IGuard_type") : //$NON-NLS-1$
 			getString("_UI_IGuard_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceSlotItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceSlotItemProvider.java
index b64de7d5c0d..8dc46a88a28 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceSlotItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceSlotItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInstanceSlot;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInstanceSlot} object.
@@ -72,7 +73,10 @@ public class IInstanceSlotItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IInstanceSlot_type"); //$NON-NLS-1$
+		String label = ((IInstanceSlot)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IInstanceSlot_type") : //$NON-NLS-1$
+			getString("_UI_IInstanceSlot_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceSpecificationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceSpecificationItemProvider.java
index ff4c473ac32..04582c1be6b 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceSpecificationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceSpecificationItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInstanceSpecification;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInstanceSpecification} object.
@@ -72,7 +73,10 @@ public class IInstanceSpecificationItemProvider extends IModelElementItemProvide
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IInstanceSpecification_type"); //$NON-NLS-1$
+		String label = ((IInstanceSpecification)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IInstanceSpecification_type") : //$NON-NLS-1$
+			getString("_UI_IInstanceSpecification_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceValueItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceValueItemProvider.java
index acfa548f373..c002ad98db2 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceValueItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInstanceValueItemProvider.java
@@ -147,7 +147,7 @@ public class IInstanceValueItemProvider extends IValueSpecificationItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((IInstanceValue)object).getId();
+		String label = ((IInstanceValue)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_IInstanceValue_type") : //$NON-NLS-1$
 			getString("_UI_IInstanceValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInteractionOperatorItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInteractionOperatorItemProvider.java
index 8a9874c8774..1829d405fda 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInteractionOperatorItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInteractionOperatorItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInteractionOperator;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInteractionOperator} object.
@@ -72,7 +73,10 @@ public class IInteractionOperatorItemProvider extends IModelElementItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IInteractionOperator_type"); //$NON-NLS-1$
+		String label = ((IInteractionOperator)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IInteractionOperator_type") : //$NON-NLS-1$
+			getString("_UI_IInteractionOperator_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInterfaceItemItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInterfaceItemItemProvider.java
index ac62549cdb9..0d97ecb741d 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInterfaceItemItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInterfaceItemItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInterfaceItem;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInterfaceItem} object.
@@ -72,7 +73,10 @@ public class IInterfaceItemItemProvider extends IClassifierItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IInterfaceItem_type"); //$NON-NLS-1$
+		String label = ((IInterfaceItem)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IInterfaceItem_type") : //$NON-NLS-1$
+			getString("_UI_IInterfaceItem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInternalHyperlinkItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInternalHyperlinkItemProvider.java
index c691264498d..76978c833fc 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInternalHyperlinkItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IInternalHyperlinkItemProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IInternalHyperlink;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage;
 
 /**
@@ -98,7 +99,10 @@ public class IInternalHyperlinkItemProvider extends HyperLinksTypeItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IInternalHyperlink_type"); //$NON-NLS-1$
+		String label = ((IInternalHyperlink)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IInternalHyperlink_type") : //$NON-NLS-1$
+			getString("_UI_IInternalHyperlink_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMHyperLinkItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMHyperLinkItemProvider.java
index e64933fc870..6c24a8cbe2d 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMHyperLinkItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMHyperLinkItemProvider.java
@@ -65,7 +65,6 @@ public class IMHyperLinkItemProvider extends HyperLinksTypeItemProvider {
 			addLinkTypePropertyDescriptor(object);
 			addIsConfigurationFileHyperLinkPropertyDescriptor(object);
 			addLinkTargetPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addRequiremenTracabilityHandlePropertyDescriptor(object);
 			addObjectCreationPropertyDescriptor(object);
 			addUmlDependencyIDPropertyDescriptor(object);
@@ -228,28 +227,6 @@ public class IMHyperLinkItemProvider extends HyperLinksTypeItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IMHyperLink_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IMHyperLink_displayName_feature", "_UI_IMHyperLink_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIMHyperLink_DisplayName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
 	 * This adds a property descriptor for the Requiremen Tracability Handle feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -365,7 +342,7 @@ public class IMHyperLinkItemProvider extends HyperLinksTypeItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((IMHyperLink)object).getId();
+		String label = ((IMHyperLink)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_IMHyperLink_type") : //$NON-NLS-1$
 			getString("_UI_IMHyperLink_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
@@ -390,7 +367,6 @@ public class IMHyperLinkItemProvider extends HyperLinksTypeItemProvider {
 			case UMLRhapsodyPackage.IM_HYPER_LINK__LINK_TYPE:
 			case UMLRhapsodyPackage.IM_HYPER_LINK__IS_CONFIGURATION_FILE_HYPER_LINK:
 			case UMLRhapsodyPackage.IM_HYPER_LINK__LINK_TARGET:
-			case UMLRhapsodyPackage.IM_HYPER_LINK__DISPLAY_NAME:
 			case UMLRhapsodyPackage.IM_HYPER_LINK__REQUIREMEN_TRACABILITY_HANDLE:
 			case UMLRhapsodyPackage.IM_HYPER_LINK__OBJECT_CREATION:
 			case UMLRhapsodyPackage.IM_HYPER_LINK__UML_DEPENDENCY_ID:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMatrixViewItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMatrixViewItemProvider.java
index ff21bbac421..b82e25fdb3d 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMatrixViewItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMatrixViewItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMatrixView;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMatrixView} object.
@@ -72,7 +73,10 @@ public class IMatrixViewItemProvider extends IUnitItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IMatrixView_type"); //$NON-NLS-1$
+		String label = ((IMatrixView)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IMatrixView_type") : //$NON-NLS-1$
+			getString("_UI_IMatrixView_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMessageItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMessageItemProvider.java
index 10e8070dc5c..35b4092afa8 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMessageItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMessageItemProvider.java
@@ -61,7 +61,6 @@ public class IMessageItemProvider extends IModelElementItemProvider {
 			addIdPropertyDescriptor(object);
 			addMyStatePropertyDescriptor(object);
 			addNamePropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addM_szSequencePropertyDescriptor(object);
 			addM_szActualArgsPropertyDescriptor(object);
 			addM_szReturnValPropertyDescriptor(object);
@@ -147,28 +146,6 @@ public class IMessageItemProvider extends IModelElementItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IMessage_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IMessage_displayName_feature", "_UI_IMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIMessage_DisplayName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
 	 * This adds a property descriptor for the Msz Sequence feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -549,7 +526,6 @@ public class IMessageItemProvider extends IModelElementItemProvider {
 			case UMLRhapsodyPackage.IMESSAGE__ID:
 			case UMLRhapsodyPackage.IMESSAGE__MY_STATE:
 			case UMLRhapsodyPackage.IMESSAGE__NAME:
-			case UMLRhapsodyPackage.IMESSAGE__DISPLAY_NAME:
 			case UMLRhapsodyPackage.IMESSAGE__MSZ_SEQUENCE:
 			case UMLRhapsodyPackage.IMESSAGE__MSZ_ACTUAL_ARGS:
 			case UMLRhapsodyPackage.IMESSAGE__MSZ_RETURN_VAL:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMessagePointItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMessagePointItemProvider.java
index 08ca5292d30..4c992b00cbe 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMessagePointItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IMessagePointItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessagePoint;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessagePoint} object.
@@ -72,7 +73,10 @@ public class IMessagePointItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IMessagePoint_type"); //$NON-NLS-1$
+		String label = ((IMessagePoint)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IMessagePoint_type") : //$NON-NLS-1$
+			getString("_UI_IMessagePoint_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IModelElementItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IModelElementItemProvider.java
index 2bb27b27769..03186891e91 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IModelElementItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IModelElementItemProvider.java
@@ -21,13 +21,18 @@ 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;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement} object.
@@ -64,11 +69,34 @@ public class IModelElementItemProvider
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addDisplayNamePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
+	 * This adds a property descriptor for the Display Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(),
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This returns IModelElement.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -87,7 +115,10 @@ public class IModelElementItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IModelElement_type"); //$NON-NLS-1$
+		String label = ((IModelElement)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IModelElement_type") : //$NON-NLS-1$
+			getString("_UI_IModelElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
@@ -101,6 +132,12 @@ public class IModelElementItemProvider
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
+
+		switch (notification.getFeatureID(IModelElement.class)) {
+			case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
 		super.notifyChanged(notification);
 	}
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/INodeItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/INodeItemProvider.java
index 16857ae6f7c..152a97a1b77 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/INodeItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/INodeItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.INode;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.INode} object.
@@ -72,7 +73,10 @@ public class INodeItemProvider extends IClassifierItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_INode_type"); //$NON-NLS-1$
+		String label = ((INode)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_INode_type") : //$NON-NLS-1$
+			getString("_UI_INode_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectModelDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectModelDiagramItemProvider.java
index 91e95753557..acdcba5e071 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectModelDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectModelDiagramItemProvider.java
@@ -120,7 +120,8 @@ public class IObjectModelDiagramItemProvider extends IDiagramItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectNodeItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectNodeItemProvider.java
index 4e6bd6f7a59..76293c61e2d 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectNodeItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IObjectNodeItemProvider.java
@@ -238,9 +238,9 @@ public class IObjectNodeItemProvider extends IStateItemProvider {
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIObjectNode_TheInState() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_ExitAction() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Annotations() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IOperationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IOperationItemProvider.java
index f321d61680c..2cc79db28a1 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IOperationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IOperationItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IOperation;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IOperation} object.
@@ -72,7 +73,10 @@ public class IOperationItemProvider extends IInterfaceItemItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IOperation_type"); //$NON-NLS-1$
+		String label = ((IOperation)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IOperation_type") : //$NON-NLS-1$
+			getString("_UI_IOperation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPanelDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPanelDiagramItemProvider.java
index e8fa4d709c7..c0c91583bf1 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPanelDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPanelDiagramItemProvider.java
@@ -120,7 +120,8 @@ public class IPanelDiagramItemProvider extends IDiagramItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPartItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPartItemProvider.java
index e2b57074c9e..ae38f5a6823 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPartItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPartItemProvider.java
@@ -67,9 +67,9 @@ public class IPartItemProvider extends AssociationsTypeItemProvider {
 			addRequiremenTracabilityHandlePropertyDescriptor(object);
 			addLastIDPropertyDescriptor(object);
 			addMultiplicityPropertyDescriptor(object);
+			addDisplayNamePropertyDescriptor(object);
 			addOtherClassPropertyDescriptor(object);
 			addInversePropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addCodeUpdateCGTimePropertyDescriptor(object);
 			addTheMainDiagramPropertyDescriptor(object);
 		}
@@ -329,9 +329,9 @@ public class IPartItemProvider extends AssociationsTypeItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_IPart_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IPart_displayName_feature", "_UI_IPart_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIPart_DisplayName(),
+				 getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(),
 				 true,
 				 false,
 				 false,
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPrimitiveOperationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPrimitiveOperationItemProvider.java
index 754946b9df2..26d868efa1a 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPrimitiveOperationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IPrimitiveOperationItemProvider.java
@@ -64,6 +64,7 @@ public class IPrimitiveOperationItemProvider extends OperationsTypeItemProvider
 			addIdPropertyDescriptor(object);
 			addMyStatePropertyDescriptor(object);
 			addNamePropertyDescriptor(object);
+			addDisplayNamePropertyDescriptor(object);
 			addLastIDPropertyDescriptor(object);
 			addReturnTypePropertyDescriptor(object);
 			addAbstractPropertyDescriptor(object);
@@ -72,7 +73,6 @@ public class IPrimitiveOperationItemProvider extends OperationsTypeItemProvider
 			addProtectionPropertyDescriptor(object);
 			addStaticPropertyDescriptor(object);
 			addConstantPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addRequiremenTracabilityHandlePropertyDescriptor(object);
 			addCodeUpdateCGTimePropertyDescriptor(object);
 		}
@@ -398,9 +398,9 @@ public class IPrimitiveOperationItemProvider extends OperationsTypeItemProvider
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_IPrimitiveOperation_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IPrimitiveOperation_displayName_feature", "_UI_IPrimitiveOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIPrimitiveOperation_DisplayName(),
+				 getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(),
 				 true,
 				 false,
 				 false,
@@ -539,6 +539,7 @@ public class IPrimitiveOperationItemProvider extends OperationsTypeItemProvider
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__ID:
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__MY_STATE:
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__NAME:
+			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__LAST_ID:
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__ABSTRACT:
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__FINAL:
@@ -546,7 +547,6 @@ public class IPrimitiveOperationItemProvider extends OperationsTypeItemProvider
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__PROTECTION:
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__STATIC:
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__CONSTANT:
-			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__REQUIREMEN_TRACABILITY_HANDLE:
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__CODE_UPDATE_CG_TIME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProfileItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProfileItemProvider.java
index 2533675afe6..27348c2f0ee 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProfileItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProfileItemProvider.java
@@ -64,7 +64,6 @@ public class IProfileItemProvider extends IPackageItemProvider {
 			addEventsBaseIDPropertyDescriptor(object);
 			addConfigurationRelatedTimePropertyDescriptor(object);
 			addLicensePropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -202,28 +201,6 @@ public class IProfileItemProvider extends IPackageItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IProfile_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IProfile_displayName_feature", "_UI_IProfile_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIProfile_DisplayName(),
-				 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}.
@@ -300,7 +277,6 @@ public class IProfileItemProvider extends IPackageItemProvider {
 			case UMLRhapsodyPackage.IPROFILE__EVENTS_BASE_ID:
 			case UMLRhapsodyPackage.IPROFILE__CONFIGURATION_RELATED_TIME:
 			case UMLRhapsodyPackage.IPROFILE__LICENSE:
-			case UMLRhapsodyPackage.IPROFILE__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.IPROFILE__DECLARATIVES:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProjectItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProjectItemProvider.java
index fa18f0af86d..067cc87806e 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProjectItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IProjectItemProvider.java
@@ -391,6 +391,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
+				 UMLRhapsodyFactory.eINSTANCE.createIActivityGraph()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
 				 UMLRhapsodyFactory.eINSTANCE.createIUnit()));
 
 		newChildDescriptors.add
@@ -551,6 +556,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
+				 UMLRhapsodyFactory.eINSTANCE.createIExternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
 				 UMLRhapsodyFactory.eINSTANCE.createIFile()));
 
 		newChildDescriptors.add
@@ -626,6 +636,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
+				 UMLRhapsodyFactory.eINSTANCE.createIInternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
 				 UMLRhapsodyFactory.eINSTANCE.createILink()));
 
 		newChildDescriptors.add
@@ -636,6 +651,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
+				 UMLRhapsodyFactory.eINSTANCE.createIMHyperLink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
 				 UMLRhapsodyFactory.eINSTANCE.createIMatrixLayout()));
 
 		newChildDescriptors.add
@@ -691,6 +711,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPart()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
 				 UMLRhapsodyFactory.eINSTANCE.createIPin()));
 
 		newChildDescriptors.add
@@ -701,6 +726,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPrimitiveOperation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
 				 UMLRhapsodyFactory.eINSTANCE.createIProfile()));
 
 		newChildDescriptors.add
@@ -746,6 +776,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
+				 UMLRhapsodyFactory.eINSTANCE.createISubsystem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
 				 UMLRhapsodyFactory.eINSTANCE.createISwimlane()));
 
 		newChildDescriptors.add
@@ -796,6 +831,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
+				 UMLRhapsodyFactory.eINSTANCE.createITriggered()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Diagrams(),
 				 UMLRhapsodyFactory.eINSTANCE.createIType()));
 
 		newChildDescriptors.add
@@ -841,6 +881,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
+				 UMLRhapsodyFactory.eINSTANCE.createIActivityGraph()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
 				 UMLRhapsodyFactory.eINSTANCE.createIUnit()));
 
 		newChildDescriptors.add
@@ -1001,6 +1046,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
+				 UMLRhapsodyFactory.eINSTANCE.createIExternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
 				 UMLRhapsodyFactory.eINSTANCE.createIFile()));
 
 		newChildDescriptors.add
@@ -1076,6 +1126,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
+				 UMLRhapsodyFactory.eINSTANCE.createIInternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
 				 UMLRhapsodyFactory.eINSTANCE.createILink()));
 
 		newChildDescriptors.add
@@ -1086,6 +1141,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
+				 UMLRhapsodyFactory.eINSTANCE.createIMHyperLink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
 				 UMLRhapsodyFactory.eINSTANCE.createIMatrixLayout()));
 
 		newChildDescriptors.add
@@ -1141,6 +1201,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPart()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
 				 UMLRhapsodyFactory.eINSTANCE.createIPin()));
 
 		newChildDescriptors.add
@@ -1151,6 +1216,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPrimitiveOperation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
 				 UMLRhapsodyFactory.eINSTANCE.createIProfile()));
 
 		newChildDescriptors.add
@@ -1196,6 +1266,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
+				 UMLRhapsodyFactory.eINSTANCE.createISubsystem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
 				 UMLRhapsodyFactory.eINSTANCE.createISwimlane()));
 
 		newChildDescriptors.add
@@ -1246,6 +1321,11 @@ public class IProjectItemProvider extends IPackageItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
+				 UMLRhapsodyFactory.eINSTANCE.createITriggered()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIProject_Components(),
 				 UMLRhapsodyFactory.eINSTANCE.createIType()));
 
 		newChildDescriptors.add
@@ -1424,6 +1504,7 @@ public class IProjectItemProvider extends IPackageItemProvider {
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIProject_CollaborationDiagrams() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIProject_ComponentDiagrams() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIProject_Dependencies() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIProject_HyperLinks() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIProject_PanelDiagrams() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIProject_Declaratives() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIProject_UCDiagrams();
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IRelationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IRelationItemProvider.java
index ceba78a4520..56600df0b5f 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IRelationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IRelationItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRelation;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRelation} object.
@@ -72,7 +73,10 @@ public class IRelationItemProvider extends IUnitItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IRelation_type"); //$NON-NLS-1$
+		String label = ((IRelation)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IRelation_type") : //$NON-NLS-1$
+			getString("_UI_IRelation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IRequirementItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IRequirementItemProvider.java
index d57d635d20a..103cda30c9d 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IRequirementItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IRequirementItemProvider.java
@@ -64,7 +64,6 @@ public class IRequirementItemProvider extends IAnnotationItemProvider {
 			addLastIDPropertyDescriptor(object);
 			addModifiedTimeWeakPropertyDescriptor(object);
 			addReqIDPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addTheMainDiagramPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -203,28 +202,6 @@ public class IRequirementItemProvider extends IAnnotationItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IRequirement_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IRequirement_displayName_feature", "_UI_IRequirement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIRequirement_DisplayName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
 	 * This adds a property descriptor for the The Main Diagram feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -324,7 +301,6 @@ public class IRequirementItemProvider extends IAnnotationItemProvider {
 			case UMLRhapsodyPackage.IREQUIREMENT__LAST_ID:
 			case UMLRhapsodyPackage.IREQUIREMENT__MODIFIED_TIME_WEAK:
 			case UMLRhapsodyPackage.IREQUIREMENT__REQ_ID:
-			case UMLRhapsodyPackage.IREQUIREMENT__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.IREQUIREMENT__ANNOTATIONS:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISendActionItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISendActionItemProvider.java
index 72917e31c99..749afb5e371 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISendActionItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISendActionItemProvider.java
@@ -158,7 +158,7 @@ public class ISendActionItemProvider extends IActionItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ISendAction)object).getId();
+		String label = ((ISendAction)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_ISendAction_type") : //$NON-NLS-1$
 			getString("_UI_ISendAction_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISequenceDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISequenceDiagramItemProvider.java
index a34945c2751..0ed8cf60394 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISequenceDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISequenceDiagramItemProvider.java
@@ -120,7 +120,8 @@ public class ISequenceDiagramItemProvider extends IDiagramItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartDiagramItemProvider.java
index 7f51a979ef4..d5cfe12cef9 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartDiagramItemProvider.java
@@ -120,7 +120,8 @@ public class IStateChartDiagramItemProvider extends IDiagramItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartItemProvider.java
index d1bcc379b1a..dc61f42b922 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateChartItemProvider.java
@@ -422,6 +422,7 @@ public class IStateChartItemProvider extends IClassItemProvider {
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getNestedStateChartType_Connectors() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIStateChart_States() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_Dependencies() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIClass_HyperLinks() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getNestedStateChartType_Transitions();
 
 		if (qualify) {
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateItemProvider.java
index b3eb826e653..0226ac23ab2 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStateItemProvider.java
@@ -63,7 +63,6 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 			addDefaultTransPropertyDescriptor(object);
 			addInheritsFromHandlePropertyDescriptor(object);
 			addRequiremenTracabilityHandlePropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addTheMainDiagramPropertyDescriptor(object);
 			addSwimlanePropertyDescriptor(object);
 			addCodeUpdateCGTimePropertyDescriptor(object);
@@ -182,28 +181,6 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IState_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IState_displayName_feature", "_UI_IState_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIState_DisplayName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
 	 * This adds a property descriptor for the The Main Diagram feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -345,7 +322,6 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 			case UMLRhapsodyPackage.ISTATE__STATE_TYPE:
 			case UMLRhapsodyPackage.ISTATE__DEFAULT_TRANS:
 			case UMLRhapsodyPackage.ISTATE__REQUIREMEN_TRACABILITY_HANDLE:
-			case UMLRhapsodyPackage.ISTATE__DISPLAY_NAME:
 			case UMLRhapsodyPackage.ISTATE__CODE_UPDATE_CG_TIME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
@@ -404,6 +380,11 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
+				 UMLRhapsodyFactory.eINSTANCE.createIActivityGraph()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
 				 UMLRhapsodyFactory.eINSTANCE.createIUnit()));
 
 		newChildDescriptors.add
@@ -564,6 +545,11 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
+				 UMLRhapsodyFactory.eINSTANCE.createIExternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
 				 UMLRhapsodyFactory.eINSTANCE.createIFile()));
 
 		newChildDescriptors.add
@@ -639,6 +625,11 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
+				 UMLRhapsodyFactory.eINSTANCE.createIInternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
 				 UMLRhapsodyFactory.eINSTANCE.createILink()));
 
 		newChildDescriptors.add
@@ -649,6 +640,11 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
+				 UMLRhapsodyFactory.eINSTANCE.createIMHyperLink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
 				 UMLRhapsodyFactory.eINSTANCE.createIMatrixLayout()));
 
 		newChildDescriptors.add
@@ -704,6 +700,11 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPart()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
 				 UMLRhapsodyFactory.eINSTANCE.createIPin()));
 
 		newChildDescriptors.add
@@ -714,6 +715,11 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPrimitiveOperation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
 				 UMLRhapsodyFactory.eINSTANCE.createIProfile()));
 
 		newChildDescriptors.add
@@ -759,6 +765,11 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
+				 UMLRhapsodyFactory.eINSTANCE.createISubsystem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
 				 UMLRhapsodyFactory.eINSTANCE.createISwimlane()));
 
 		newChildDescriptors.add
@@ -809,6 +820,11 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
+				 UMLRhapsodyFactory.eINSTANCE.createITriggered()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction(),
 				 UMLRhapsodyFactory.eINSTANCE.createIType()));
 
 		newChildDescriptors.add
@@ -886,9 +902,9 @@ public class IStateItemProvider extends IStateVertexItemProvider {
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_EntryAction() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_ExitAction() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Annotations() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_NestedStateChart();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIState_Dependencies();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStereotypeItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStereotypeItemProvider.java
index 6b50cddd644..cb719f8c41d 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStereotypeItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStereotypeItemProvider.java
@@ -66,7 +66,6 @@ public class IStereotypeItemProvider extends IClassifierItemProvider {
 			addNewTermPropertyDescriptor(object);
 			addLastIDPropertyDescriptor(object);
 			addRequiremenTracabilityHandlePropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addObjectCreationPropertyDescriptor(object);
 			addUmlDependencyIDPropertyDescriptor(object);
 			addTheMainDiagramPropertyDescriptor(object);
@@ -251,28 +250,6 @@ public class IStereotypeItemProvider extends IClassifierItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IStereotype_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_IStereotype_displayName_feature", "_UI_IStereotype_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getIStereotype_DisplayName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
 	 * This adds a property descriptor for the Object Creation feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -419,7 +396,6 @@ public class IStereotypeItemProvider extends IClassifierItemProvider {
 			case UMLRhapsodyPackage.ISTEREOTYPE__NEW_TERM:
 			case UMLRhapsodyPackage.ISTEREOTYPE__LAST_ID:
 			case UMLRhapsodyPackage.ISTEREOTYPE__REQUIREMEN_TRACABILITY_HANDLE:
-			case UMLRhapsodyPackage.ISTEREOTYPE__DISPLAY_NAME:
 			case UMLRhapsodyPackage.ISTEREOTYPE__OBJECT_CREATION:
 			case UMLRhapsodyPackage.ISTEREOTYPE__UML_DEPENDENCY_ID:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStructureDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStructureDiagramItemProvider.java
index 883da314320..6b0e6aa3312 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStructureDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IStructureDiagramItemProvider.java
@@ -120,7 +120,8 @@ public class IStructureDiagramItemProvider extends IDiagramItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISubsystemItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISubsystemItemProvider.java
index 2549b44a51b..0c058052ece 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISubsystemItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISubsystemItemProvider.java
@@ -58,6 +58,7 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addDisplayNamePropertyDescriptor(object);
 			addIdPropertyDescriptor(object);
 			addMyStatePropertyDescriptor(object);
 			addNamePropertyDescriptor(object);
@@ -75,7 +76,6 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 			addCodeUpdateCGTimePropertyDescriptor(object);
 			addObjectCreationPropertyDescriptor(object);
 			addUmlDependencyIDPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -465,9 +465,9 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_ISubsystem_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ISubsystem_displayName_feature", "_UI_ISubsystem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getISubsystem_DisplayName(),
+				 getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(),
 				 true,
 				 false,
 				 false,
@@ -562,6 +562,7 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ISubsystem.class)) {
+			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
 			case UMLRhapsodyPackage.ISUBSYSTEM__ID:
 			case UMLRhapsodyPackage.ISUBSYSTEM__MY_STATE:
 			case UMLRhapsodyPackage.ISUBSYSTEM__NAME:
@@ -575,7 +576,6 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 			case UMLRhapsodyPackage.ISUBSYSTEM__CODE_UPDATE_CG_TIME:
 			case UMLRhapsodyPackage.ISUBSYSTEM__OBJECT_CREATION:
 			case UMLRhapsodyPackage.ISUBSYSTEM__UML_DEPENDENCY_ID:
-			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.ISUBSYSTEM__CLASSES:
@@ -1717,6 +1717,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
+				 UMLRhapsodyFactory.eINSTANCE.createIActivityGraph()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
 				 UMLRhapsodyFactory.eINSTANCE.createIUnit()));
 
 		newChildDescriptors.add
@@ -1877,6 +1882,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
+				 UMLRhapsodyFactory.eINSTANCE.createIExternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
 				 UMLRhapsodyFactory.eINSTANCE.createIFile()));
 
 		newChildDescriptors.add
@@ -1952,6 +1962,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
+				 UMLRhapsodyFactory.eINSTANCE.createIInternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
 				 UMLRhapsodyFactory.eINSTANCE.createILink()));
 
 		newChildDescriptors.add
@@ -1962,6 +1977,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
+				 UMLRhapsodyFactory.eINSTANCE.createIMHyperLink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
 				 UMLRhapsodyFactory.eINSTANCE.createIMatrixLayout()));
 
 		newChildDescriptors.add
@@ -2017,6 +2037,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPart()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
 				 UMLRhapsodyFactory.eINSTANCE.createIPin()));
 
 		newChildDescriptors.add
@@ -2027,6 +2052,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPrimitiveOperation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
 				 UMLRhapsodyFactory.eINSTANCE.createIProfile()));
 
 		newChildDescriptors.add
@@ -2072,6 +2102,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
+				 UMLRhapsodyFactory.eINSTANCE.createISubsystem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
 				 UMLRhapsodyFactory.eINSTANCE.createISwimlane()));
 
 		newChildDescriptors.add
@@ -2122,6 +2157,11 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
+				 UMLRhapsodyFactory.eINSTANCE.createITriggered()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getISubsystem_TableLayouts(),
 				 UMLRhapsodyFactory.eINSTANCE.createIType()));
 
 		newChildDescriptors.add
@@ -2184,7 +2224,8 @@ public class ISubsystemItemProvider extends OwnerHandleTypeItemProvider {
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getISubsystem_ComponentFiles() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getISubsystem_MatrixLayouts() ||
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getISubsystem_Tags() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getISubsystem_Dependencies();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getISubsystem_Dependencies() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getISubsystem_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISwimlaneItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISwimlaneItemProvider.java
index 7de05032eb8..bdc58118578 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISwimlaneItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ISwimlaneItemProvider.java
@@ -65,7 +65,6 @@ public class ISwimlaneItemProvider extends IModelElementItemProvider {
 			addMyStatePropertyDescriptor(object);
 			addObjectCreationPropertyDescriptor(object);
 			addUmlDependencyIDPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -225,28 +224,6 @@ public class ISwimlaneItemProvider extends IModelElementItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ISwimlane_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ISwimlane_displayName_feature", "_UI_ISwimlane_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getISwimlane_DisplayName(),
-				 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}.
@@ -322,7 +299,6 @@ public class ISwimlaneItemProvider extends IModelElementItemProvider {
 			case UMLRhapsodyPackage.ISWIMLANE__MY_STATE:
 			case UMLRhapsodyPackage.ISWIMLANE__OBJECT_CREATION:
 			case UMLRhapsodyPackage.ISWIMLANE__UML_DEPENDENCY_ID:
-			case UMLRhapsodyPackage.ISWIMLANE__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.ISWIMLANE__DESCRIPTION:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITableViewItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITableViewItemProvider.java
index f9fbee3ccae..00e12d6b24f 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITableViewItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITableViewItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITableView;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITableView} object.
@@ -72,7 +73,10 @@ public class ITableViewItemProvider extends IUnitItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ITableView_type"); //$NON-NLS-1$
+		String label = ((ITableView)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ITableView_type") : //$NON-NLS-1$
+			getString("_UI_ITableView_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITagItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITagItemProvider.java
index 486b22ddbfc..d5f4bfbfbe6 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITagItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITagItemProvider.java
@@ -68,7 +68,6 @@ public class ITagItemProvider extends IVariableItemProvider {
 			addMetaClassPropertyDescriptor(object);
 			addDefaultValuePropertyDescriptor(object);
 			addCodeUpdateCGTimePropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -294,28 +293,6 @@ public class ITagItemProvider extends IVariableItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ITag_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ITag_displayName_feature", "_UI_ITag_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getITag_DisplayName(),
-				 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}.
@@ -394,7 +371,6 @@ public class ITagItemProvider extends IVariableItemProvider {
 			case UMLRhapsodyPackage.ITAG__META_CLASS:
 			case UMLRhapsodyPackage.ITAG__DEFAULT_VALUE:
 			case UMLRhapsodyPackage.ITAG__CODE_UPDATE_CG_TIME:
-			case UMLRhapsodyPackage.ITAG__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.ITAG__VALUE_SPECIFICATIONS:
@@ -451,6 +427,11 @@ public class ITagItemProvider extends IVariableItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
+				 UMLRhapsodyFactory.eINSTANCE.createIActivityGraph()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
 				 UMLRhapsodyFactory.eINSTANCE.createIUnit()));
 
 		newChildDescriptors.add
@@ -611,6 +592,11 @@ public class ITagItemProvider extends IVariableItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
+				 UMLRhapsodyFactory.eINSTANCE.createIExternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
 				 UMLRhapsodyFactory.eINSTANCE.createIFile()));
 
 		newChildDescriptors.add
@@ -686,6 +672,11 @@ public class ITagItemProvider extends IVariableItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
+				 UMLRhapsodyFactory.eINSTANCE.createIInternalHyperlink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
 				 UMLRhapsodyFactory.eINSTANCE.createILink()));
 
 		newChildDescriptors.add
@@ -696,6 +687,11 @@ public class ITagItemProvider extends IVariableItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
+				 UMLRhapsodyFactory.eINSTANCE.createIMHyperLink()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
 				 UMLRhapsodyFactory.eINSTANCE.createIMatrixLayout()));
 
 		newChildDescriptors.add
@@ -751,6 +747,11 @@ public class ITagItemProvider extends IVariableItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPart()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
 				 UMLRhapsodyFactory.eINSTANCE.createIPin()));
 
 		newChildDescriptors.add
@@ -761,6 +762,11 @@ public class ITagItemProvider extends IVariableItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
+				 UMLRhapsodyFactory.eINSTANCE.createIPrimitiveOperation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
 				 UMLRhapsodyFactory.eINSTANCE.createIProfile()));
 
 		newChildDescriptors.add
@@ -806,6 +812,11 @@ public class ITagItemProvider extends IVariableItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
+				 UMLRhapsodyFactory.eINSTANCE.createISubsystem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
 				 UMLRhapsodyFactory.eINSTANCE.createISwimlane()));
 
 		newChildDescriptors.add
@@ -856,6 +867,11 @@ public class ITagItemProvider extends IVariableItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
+				 UMLRhapsodyFactory.eINSTANCE.createITriggered()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications(),
 				 UMLRhapsodyFactory.eINSTANCE.createIType()));
 
 		newChildDescriptors.add
@@ -897,7 +913,8 @@ public class ITagItemProvider extends IVariableItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIVariable_MyTypeOf() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getITag_ValueSpecifications() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getITag_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITemplateInstantiationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITemplateInstantiationItemProvider.java
index 8cd9cf8d3f1..8755de5082a 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITemplateInstantiationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITemplateInstantiationItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITemplateInstantiation;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITemplateInstantiation} object.
@@ -72,7 +73,10 @@ public class ITemplateInstantiationItemProvider extends IModelElementItemProvide
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ITemplateInstantiation_type"); //$NON-NLS-1$
+		String label = ((ITemplateInstantiation)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ITemplateInstantiation_type") : //$NON-NLS-1$
+			getString("_UI_ITemplateInstantiation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITemplateInstantiationParameterItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITemplateInstantiationParameterItemProvider.java
index 1c384d69185..3b08b623e79 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITemplateInstantiationParameterItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITemplateInstantiationParameterItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITemplateInstantiationParameter;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITemplateInstantiationParameter} object.
@@ -72,7 +73,10 @@ public class ITemplateInstantiationParameterItemProvider extends IModelElementIt
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ITemplateInstantiationParameter_type"); //$NON-NLS-1$
+		String label = ((ITemplateInstantiationParameter)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ITemplateInstantiationParameter_type") : //$NON-NLS-1$
+			getString("_UI_ITemplateInstantiationParameter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITransitionItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITransitionItemProvider.java
index d2be3e79b60..06b10317b1e 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITransitionItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITransitionItemProvider.java
@@ -70,7 +70,6 @@ public class ITransitionItemProvider extends IModelElementItemProvider {
 			addNamePropertyDescriptor(object);
 			addItsSourcePropertyDescriptor(object);
 			addInheritsFromHandlePropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -340,28 +339,6 @@ public class ITransitionItemProvider extends IModelElementItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Display Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ITransition_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ITransition_displayName_feature", "_UI_ITransition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getITransition_DisplayName(),
-				 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}.
@@ -441,7 +418,6 @@ public class ITransitionItemProvider extends IModelElementItemProvider {
 			case UMLRhapsodyPackage.ITRANSITION__MY_STATE:
 			case UMLRhapsodyPackage.ITRANSITION__OBJECT_CREATION:
 			case UMLRhapsodyPackage.ITRANSITION__NAME:
-			case UMLRhapsodyPackage.ITRANSITION__DISPLAY_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case UMLRhapsodyPackage.ITRANSITION__DESCRIPTION:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITriggerItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITriggerItemProvider.java
index e82a65c348d..764375a6bfe 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITriggerItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITriggerItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITrigger;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITrigger} object.
@@ -72,7 +73,10 @@ public class ITriggerItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ITrigger_type"); //$NON-NLS-1$
+		String label = ((ITrigger)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ITrigger_type") : //$NON-NLS-1$
+			getString("_UI_ITrigger_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITriggeredItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITriggeredItemProvider.java
index 40c3279e6f8..0be0dfc4787 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITriggeredItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/ITriggeredItemProvider.java
@@ -58,9 +58,9 @@ public class ITriggeredItemProvider extends OperationsTypeItemProvider {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addDisplayNamePropertyDescriptor(object);
 			addIdPropertyDescriptor(object);
 			addNamePropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
 			addReturnTypePropertyDescriptor(object);
 			addAbstractPropertyDescriptor(object);
 			addFinalPropertyDescriptor(object);
@@ -127,9 +127,9 @@ public class ITriggeredItemProvider extends OperationsTypeItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_ITriggered_displayName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ITriggered_displayName_feature", "_UI_ITriggered_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 UMLRhapsodyPackage.eINSTANCE.getITriggered_DisplayName(),
+				 getString("_UI_IModelElement_displayName_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IModelElement_displayName_feature", "_UI_IModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 UMLRhapsodyPackage.eINSTANCE.getIModelElement_DisplayName(),
 				 true,
 				 false,
 				 false,
@@ -360,9 +360,9 @@ public class ITriggeredItemProvider extends OperationsTypeItemProvider {
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ITriggered.class)) {
+			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
 			case UMLRhapsodyPackage.ITRIGGERED__ID:
 			case UMLRhapsodyPackage.ITRIGGERED__NAME:
-			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
 			case UMLRhapsodyPackage.ITRIGGERED__ABSTRACT:
 			case UMLRhapsodyPackage.ITRIGGERED__FINAL:
 			case UMLRhapsodyPackage.ITRIGGERED__CONCURRENCY:
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IUnitItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IUnitItemProvider.java
index 0e9f2e19b1c..54bd9f13c67 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IUnitItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IUnitItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IUnit;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IUnit} object.
@@ -72,7 +73,10 @@ public class IUnitItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IUnit_type"); //$NON-NLS-1$
+		String label = ((IUnit)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IUnit_type") : //$NON-NLS-1$
+			getString("_UI_IUnit_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IUseCaseDiagramItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IUseCaseDiagramItemProvider.java
index 94298d4cfab..8a053db1aba 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IUseCaseDiagramItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IUseCaseDiagramItemProvider.java
@@ -120,7 +120,8 @@ public class IUseCaseDiagramItemProvider extends IDiagramItemProvider {
 
 		boolean qualify =
 			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Stereotypes() ||
-			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations();
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_Annotations() ||
+			childFeature == UMLRhapsodyPackage.eINSTANCE.getIDiagram_HyperLinks();
 
 		if (qualify) {
 			return getString
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IValueSpecificationItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IValueSpecificationItemProvider.java
index cf8f15a983c..d31895ebf27 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IValueSpecificationItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IValueSpecificationItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IValueSpecification;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IValueSpecification} object.
@@ -72,7 +73,10 @@ public class IValueSpecificationItemProvider extends IModelElementItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_IValueSpecification_type"); //$NON-NLS-1$
+		String label = ((IValueSpecification)object).getDisplayName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IValueSpecification_type") : //$NON-NLS-1$
+			getString("_UI_IValueSpecification_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IVariableItemProvider.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IVariableItemProvider.java
index 071fbb0d0c3..e91bcebbf75 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IVariableItemProvider.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel.edit/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/provider/IVariableItemProvider.java
@@ -134,7 +134,7 @@ public class IVariableItemProvider extends IUnitItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((IVariable)object).getIsOrdered();
+		String label = ((IVariable)object).getDisplayName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_IVariable_type") : //$NON-NLS-1$
 			getString("_UI_IVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/model/Rhapsody.ecore b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/model/Rhapsody.ecore
index 7e93c870e83..fdee2f0b9ce 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/model/Rhapsody.ecore
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/model/Rhapsody.ecore
@@ -1039,7 +1039,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m_bIsPreferencesInitialized"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HyperLinksType" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="HyperLinksType" abstract="true" eSuperTypes="#//IModelElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="IAcceptEventAction" eSuperTypes="#//IState #//ParentType #//ItsTargetType">
     <eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="#//IEvent"/>
   </eClassifiers>
@@ -1059,7 +1059,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IActivityGraph" eSuperTypes="#//NestedStateChartType #//DependsOnType #//ValueType #//TargetType #//M_pModelObjectType">
+  <eClassifiers xsi:type="ecore:EClass" name="IActivityGraph" eSuperTypes="#//NestedStateChartType #//DependsOnType #//ValueType #//TargetType #//M_pModelObjectType #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="weakCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -1091,7 +1091,6 @@
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectCreation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="HyperLinks" eType="#//IMHyperLink"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" upperBound="-1"
@@ -1351,7 +1350,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="cmheader" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IClassHandle" eSuperTypes="#//M_pBaseType">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m2Class" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -1383,7 +1381,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IStereotype"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectCreation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ICodeGenConfigInfo" eSuperTypes="#//DependsOnType">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -1619,7 +1616,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Tags" eType="#//ITag" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" eType="#//IComment"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" eType="#//IDependency"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="description" eType="#//IDescription"
@@ -1667,7 +1663,6 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" upperBound="-1"
         eType="#//IAnnotation" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="HyperLinks" upperBound="-1"
@@ -1720,7 +1715,6 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" eType="#//IConstraint"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IEventHandle">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m2Class" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -1983,7 +1977,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isConfigurationFileHyperLink"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkTarget" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="description" eType="#//IDescription"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiremenTracabilityHandle"
@@ -2056,7 +2049,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="myState" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m_szSequence" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m_szActualArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m_szReturnVal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2087,7 +2079,16 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IModelElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IModelElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This object this be the common one for all Rhapsody Semantic Element&#xD;&#xA;Diagram seems considered as a semantic element in Rhapsody"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="As the object IModelElement seems be the common Rhapsody semantic element, &#xD;&#xA;we remove the field &quot;displayName&quot; of all elements owning a such field, and we put it here.&#xD;&#xA;All semantic Rhapsody elements should extend this one now."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IModule" eSuperTypes="#//IInstance #//AssociationsType #//DependsOnType #//M_pModelObjectType #//End2_Type">
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IStereotype"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="description" eType="#//IDescription"
@@ -2162,7 +2163,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="cmheader" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IPanelDiagram" eSuperTypes="#//IDiagram #//DeclarativesType #//TargetType"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IPart" eSuperTypes="#//AssociationsType #//DependsOnType #//M_subjectType #//ValueType #//M_hTargetType #//M_pModelObjectType #//ToLinkType #//InverseType #//ConveyedType #//End2_Type #//TargetType #//FromLinkType #//End1_Type">
+  <eClassifiers xsi:type="ecore:EClass" name="IPart" eSuperTypes="#//AssociationsType #//DependsOnType #//M_subjectType #//ValueType #//M_hTargetType #//M_pModelObjectType #//ToLinkType #//InverseType #//ConveyedType #//End2_Type #//TargetType #//FromLinkType #//End1_Type #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IUnit"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="otherClass" eType="#//IUnit"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inverse" eType="#//InverseType"/>
@@ -2171,7 +2172,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Tags" eType="#//ITag" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="initialCallAction" eType="#//ICallAction"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="theMainDiagram" eType="#//DependsOnType"/>
@@ -2200,7 +2200,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" eType="#//IRequirement"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPrimitiveOperation" eSuperTypes="#//OperationsType #//DependsOnType #//M_subjectType #//ValueType #//M_pFormalMessageType #//ItemsType #//TargetType #//M_pModelObjectType">
+  <eClassifiers xsi:type="ecore:EClass" name="IPrimitiveOperation" eSuperTypes="#//OperationsType #//DependsOnType #//M_subjectType #//ValueType #//M_pFormalMessageType #//ItemsType #//TargetType #//M_pModelObjectType #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="properties" eType="#//IPropertyContainer"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2226,7 +2226,6 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="description" eType="#//IDescription"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiremenTracabilityHandle"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Declaratives" upperBound="-1"
@@ -2256,7 +2255,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="MatrixLayouts" eType="#//IMatrixLayout"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="license" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IProject" eSuperTypes="#//IPackage #//M_pModelObjectType">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="UserColors" unique="false"
@@ -2354,7 +2352,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="modifiedTimeWeak" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="reqID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" upperBound="-1"
         eType="#//IDependency" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Anchors" upperBound="-1"
@@ -2391,7 +2388,6 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiremenTracabilityHandle"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" upperBound="-1"
         eType="#//IAnnotation" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" eType="#//IDependency"
@@ -2442,7 +2438,6 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiremenTracabilityHandle"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectCreation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="theMainDiagram" eType="#//IUnit"/>
@@ -2450,7 +2445,7 @@
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IStructureDiagram" eSuperTypes="#//IDiagram #//DeclarativesType #//DependsOnType #//TargetType #//TheMainDiagramType #//M_pModelObjectType"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ISubsystem" eSuperTypes="#//OwnerHandleType #//DependsOnType #//DeclarativesType #//M_pModelObjectType #//TargetType #//DefaultSubsystemType">
+  <eClassifiers xsi:type="ecore:EClass" name="ISubsystem" eSuperTypes="#//OwnerHandleType #//DependsOnType #//DeclarativesType #//M_pModelObjectType #//TargetType #//DefaultSubsystemType #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="myState" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2510,7 +2505,6 @@
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectCreation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ISwimlane" eSuperTypes="#//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2525,7 +2519,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Swimlanes" upperBound="-1"
         eType="#//ISwimlane" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IStereotype"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ISysMLPort" eSuperTypes="#//IInstance #//DependsOnType #//M_pFormalMessageType #//ToLinkType #//End2_Type #//FromLinkType #//End1_Type">
@@ -2587,7 +2580,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ITemplateInst">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2636,13 +2628,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" upperBound="-1"
         eType="#//IDependency" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IClassifier"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ITrigger" eSuperTypes="#//IModelElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ITriggered" eSuperTypes="#//OperationsType #//M_pFormalMessageType #//ItemsType">
+  <eClassifiers xsi:type="ecore:EClass" name="ITriggered" eSuperTypes="#//OperationsType #//M_pFormalMessageType #//ItemsType #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Args" upperBound="-1" eType="#//IVariable"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="#//IType"/>
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/HyperLinksType.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/HyperLinksType.java
index db5af341fdf..dcac6403e1c 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/HyperLinksType.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/HyperLinksType.java
@@ -12,8 +12,6 @@
  */
 package org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Hyper Links Type</b></em>'.
@@ -24,5 +22,5 @@ import org.eclipse.emf.ecore.EObject;
  * @model abstract="true"
  * @generated
  */
-public interface HyperLinksType extends EObject {
+public interface HyperLinksType extends IModelElement {
 } // HyperLinksType
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IActivityGraph.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IActivityGraph.java
index f829635558f..214e3a802b1 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IActivityGraph.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IActivityGraph.java
@@ -43,7 +43,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getHyperLinks <em>Hyper Links</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getTheMainDiagram <em>The Main Diagram</em>}</li>
@@ -55,7 +54,7 @@ import org.eclipse.emf.common.util.EList;
  * @model
  * @generated
  */
-public interface IActivityGraph extends NestedStateChartType, DependsOnType, ValueType, TargetType, M_pModelObjectType {
+public interface IActivityGraph extends NestedStateChartType, DependsOnType, ValueType, TargetType, M_pModelObjectType, IModelElement {
 	/**
 	 * Returns the value of the '<em><b>Last ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -517,32 +516,6 @@ public interface IActivityGraph extends NestedStateChartType, DependsOnType, Val
 	void setUmlDependencyID(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIActivityGraph_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Hyper Links</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IClass.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IClass.java
index 75340108880..db49cbb4d1b 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IClass.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IClass.java
@@ -57,7 +57,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClass#getTemplateParameters <em>Template Parameters</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClass#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClass#getCmheader <em>Cmheader</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClass#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIClass()
@@ -709,30 +708,4 @@ public interface IClass extends IClassifier, DeclarativesType, M_pBaseType, Depe
 	 */
 	void setCmheader(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIClass_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClass#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
 } // IClass
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IClassifierRole.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IClassifierRole.java
index b04ba6f7892..0956484233e 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IClassifierRole.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IClassifierRole.java
@@ -36,7 +36,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassifierRole#getStereotypes <em>Stereotypes</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassifierRole#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassifierRole#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassifierRole#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIClassifierRole()
@@ -362,30 +361,4 @@ public interface IClassifierRole extends IModelElement {
 	 */
 	void setUmlDependencyID(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIClassifierRole_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassifierRole#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
 } // IClassifierRole
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IDependency.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IDependency.java
index c3b17a08d3f..02dac76a884 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IDependency.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IDependency.java
@@ -32,7 +32,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getDependsOn <em>Depends On</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getAnnotations <em>Annotations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
@@ -269,32 +268,6 @@ public interface IDependency extends IModelElement, DependsOnType, M_subjectType
 	void setAnnotations(IComment value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIDependency_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Dependencies</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IDiagram.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IDiagram.java
index b1b8e6a64fc..d45787c73af 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IDiagram.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IDiagram.java
@@ -28,7 +28,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getModifiedTimeWeak <em>Modified Time Weak</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getGraphicChart <em>Graphic Chart</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getAnnotations <em>Annotations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getHyperLinks <em>Hyper Links</em>}</li>
  * </ul>
@@ -149,32 +148,6 @@ public interface IDiagram extends IUnit, TheMainDiagramType, DeclarativesType, D
 	EList<IAnnotation> getAnnotations();
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIDiagram_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * The list contents are of type {@link java.lang.String}.
 	 * <!-- begin-user-doc -->
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IEvent.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IEvent.java
index 50438fe3bd5..0e0b7be7666 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IEvent.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IEvent.java
@@ -37,7 +37,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEvent#getSuperEvent <em>Super Event</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEvent#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEvent#getAnnotations <em>Annotations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEvent#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIEvent()
@@ -369,30 +368,4 @@ public interface IEvent extends IInterfaceItem, M_subjectType, M_pFormalMessageT
 	 */
 	void setAnnotations(IConstraint value);
 
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIEvent_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEvent#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
 } // IEvent
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IMHyperLink.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IMHyperLink.java
index aeeaa02490b..07329d8563f 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IMHyperLink.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IMHyperLink.java
@@ -31,7 +31,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getLinkType <em>Link Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getIsConfigurationFileHyperLink <em>Is Configuration File Hyper Link</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getLinkTarget <em>Link Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getObjectCreation <em>Object Creation</em>}</li>
@@ -242,32 +241,6 @@ public interface IMHyperLink extends HyperLinksType {
 	void setLinkTarget(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIMHyperLink_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Description</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IMessage.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IMessage.java
index b25d3c4fa94..4a040a4325a 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IMessage.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IMessage.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getMyState <em>My State</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getM_szSequence <em>Msz Sequence</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getM_szActualArgs <em>Msz Actual Args</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getM_szReturnVal <em>Msz Return Val</em>}</li>
@@ -130,32 +129,6 @@ public interface IMessage extends IModelElement, DependsOnType {
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIMessage_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Msz Sequence</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IModelElement.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IModelElement.java
index 050c167f549..fcbb7a58dcd 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IModelElement.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IModelElement.java
@@ -19,10 +19,48 @@ import org.eclipse.emf.ecore.EObject;
  * A representation of the model object '<em><b>IModel Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * This object this be the common one for all Rhapsody Semantic Element
+ * Diagram seems considered as a semantic element in Rhapsody
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement#getDisplayName <em>Display Name</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIModelElement()
  * @model
  * @generated
  */
 public interface IModelElement extends EObject {
+
+	/**
+	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * As the object IModelElement seems be the common Rhapsody semantic element, 
+	 * we remove the field "displayName" of all elements owning a such field, and we put it here.
+	 * All semantic Rhapsody elements should extend this one now.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Name</em>' attribute.
+	 * @see #setDisplayName(String)
+	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIModelElement_DisplayName()
+	 * @model
+	 * @generated
+	 */
+	String getDisplayName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement#getDisplayName <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Name</em>' attribute.
+	 * @see #getDisplayName()
+	 * @generated
+	 */
+	void setDisplayName(String value);
 } // IModelElement
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IPart.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IPart.java
index b9a68ea8290..17fc74abe4e 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IPart.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IPart.java
@@ -29,7 +29,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getInitialCallAction <em>Initial Call Action</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getTheMainDiagram <em>The Main Diagram</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getSlots <em>Slots</em>}</li>
@@ -40,7 +39,7 @@ import org.eclipse.emf.common.util.EList;
  * @model
  * @generated
  */
-public interface IPart extends AssociationsType, DependsOnType, M_subjectType, ValueType, M_hTargetType, M_pModelObjectType, ToLinkType, InverseType, ConveyedType, End2_Type, TargetType, FromLinkType, End1_Type {
+public interface IPart extends AssociationsType, DependsOnType, M_subjectType, ValueType, M_hTargetType, M_pModelObjectType, ToLinkType, InverseType, ConveyedType, End2_Type, TargetType, FromLinkType, End1_Type, IModelElement {
 	/**
 	 * Returns the value of the '<em><b>Stereotypes</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -188,32 +187,6 @@ public interface IPart extends AssociationsType, DependsOnType, M_subjectType, V
 	void setInitialCallAction(ICallAction value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIPart_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * The list contents are of type {@link java.lang.String}.
 	 * <!-- begin-user-doc -->
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IPrimitiveOperation.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IPrimitiveOperation.java
index c4af6d1aaaa..79ff640fed5 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IPrimitiveOperation.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IPrimitiveOperation.java
@@ -40,7 +40,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getStereotypes <em>Stereotypes</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getMyReturnType <em>My Return Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getDeclaratives <em>Declaratives</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getItsActivityGraph <em>Its Activity Graph</em>}</li>
@@ -53,7 +52,7 @@ import org.eclipse.emf.common.util.EList;
  * @model
  * @generated
  */
-public interface IPrimitiveOperation extends OperationsType, DependsOnType, M_subjectType, ValueType, M_pFormalMessageType, ItemsType, TargetType, M_pModelObjectType {
+public interface IPrimitiveOperation extends OperationsType, DependsOnType, M_subjectType, ValueType, M_pFormalMessageType, ItemsType, TargetType, M_pModelObjectType, IModelElement {
 	/**
 	 * Returns the value of the '<em><b>Properties</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -467,32 +466,6 @@ public interface IPrimitiveOperation extends OperationsType, DependsOnType, M_su
 	void setDescription(IDescription value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIPrimitiveOperation_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IProfile.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IProfile.java
index 170ed654dff..2bfeeac51f3 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IProfile.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IProfile.java
@@ -32,7 +32,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IProfile#getTypes <em>Types</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IProfile#getMatrixLayouts <em>Matrix Layouts</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IProfile#getLicense <em>License</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IProfile#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIProfile()
@@ -224,30 +223,4 @@ public interface IProfile extends IPackage, OwnerHandleType, DependsOnType, Defa
 	 */
 	void setLicense(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIProfile_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IProfile#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
 } // IProfile
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IRequirement.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IRequirement.java
index e9f6612b224..48e16303ded 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IRequirement.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IRequirement.java
@@ -31,7 +31,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getStereotypes <em>Stereotypes</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getModifiedTimeWeak <em>Modified Time Weak</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getReqID <em>Req ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getAnchors <em>Anchors</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getHyperLinks <em>Hyper Links</em>}</li>
@@ -232,32 +231,6 @@ public interface IRequirement extends IAnnotation, DependsOnType {
 	void setReqID(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIRequirement_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Dependencies</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency}.
 	 * <!-- begin-user-doc -->
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IState.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IState.java
index c4780cee69e..f8a4317f1f6 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IState.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IState.java
@@ -31,7 +31,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getExitAction <em>Exit Action</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getNestedStateChart <em>Nested State Chart</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getAnnotations <em>Annotations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getTheMainDiagram <em>The Main Diagram</em>}</li>
@@ -253,32 +252,6 @@ public interface IState extends IStateVertex, ItsTargetType, M_pModelObjectType,
 	void setRequiremenTracabilityHandle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIState_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Annotations</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IAnnotation}.
 	 * <!-- begin-user-doc -->
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IStereotype.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IStereotype.java
index aaf2d1216c2..54f269f2cab 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IStereotype.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/IStereotype.java
@@ -32,7 +32,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getInheritances <em>Inheritances</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getTheMainDiagram <em>The Main Diagram</em>}</li>
@@ -249,32 +248,6 @@ public interface IStereotype extends IClassifier, ValueType, DeclarativesType, D
 	void setRequiremenTracabilityHandle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getIStereotype_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Object Creation</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ISubsystem.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ISubsystem.java
index 87e30bbc0f2..952e941b4f5 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ISubsystem.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ISubsystem.java
@@ -59,14 +59,13 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISubsystem#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISubsystem#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISubsystem#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISubsystem#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getISubsystem()
  * @model
  * @generated
  */
-public interface ISubsystem extends OwnerHandleType, DependsOnType, DeclarativesType, M_pModelObjectType, TargetType, DefaultSubsystemType {
+public interface ISubsystem extends OwnerHandleType, DependsOnType, DeclarativesType, M_pModelObjectType, TargetType, DefaultSubsystemType, IModelElement {
 	/**
 	 * Returns the value of the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -813,30 +812,4 @@ public interface ISubsystem extends OwnerHandleType, DependsOnType, Declaratives
 	 */
 	void setUmlDependencyID(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getISubsystem_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISubsystem#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
 } // ISubsystem
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ISwimlane.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ISwimlane.java
index fa6185fedc7..693a205562d 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ISwimlane.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ISwimlane.java
@@ -32,7 +32,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane#getSwimlanes <em>Swimlanes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane#getStereotypes <em>Stereotypes</em>}</li>
  * </ul>
  *
@@ -256,32 +255,6 @@ public interface ISwimlane extends IModelElement {
 	EList<ISwimlane> getSwimlanes();
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getISwimlane_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Stereotypes</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITag.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITag.java
index 1871bdd2ca1..74383c7216b 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITag.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITag.java
@@ -37,7 +37,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag#getMetaClass <em>Meta Class</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag#getDefaultValue <em>Default Value</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getITag()
@@ -379,30 +378,4 @@ public interface ITag extends IVariable, M_pModelObjectType {
 	 */
 	EList<String> getCodeUpdateCGTime();
 
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getITag_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
 } // ITag
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITransition.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITransition.java
index 1c8c35891c1..90f627136be 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITransition.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITransition.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITransition#getInheritsFromHandle <em>Inherits From Handle</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITransition#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITransition#getStereotypes <em>Stereotypes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITransition#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getITransition()
@@ -129,30 +128,4 @@ public interface ITransition extends IModelElement, TransitionsType, DependsOnTy
 	 */
 	void setStereotypes(IClassifier value);
 
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getITransition_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITransition#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
 } // ITransition
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITriggered.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITriggered.java
index cb8f2e33925..1599cfc8c57 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITriggered.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/ITriggered.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.common.util.EList;
  * <ul>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getArgs <em>Args</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getReturnType <em>Return Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getAbstract <em>Abstract</em>}</li>
@@ -40,7 +39,7 @@ import org.eclipse.emf.common.util.EList;
  * @model
  * @generated
  */
-public interface ITriggered extends OperationsType, M_pFormalMessageType, ItemsType {
+public interface ITriggered extends OperationsType, M_pFormalMessageType, ItemsType, IModelElement {
 	/**
 	 * Returns the value of the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -94,32 +93,6 @@ public interface ITriggered extends OperationsType, M_pFormalMessageType, ItemsT
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage#getITriggered_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Args</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IVariable}.
 	 * <!-- begin-user-doc -->
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/UMLRhapsodyPackage.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/UMLRhapsodyPackage.java
index 05f667b9fe2..3d191813d38 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/UMLRhapsodyPackage.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/UMLRhapsodyPackage.java
@@ -10173,50 +10173,68 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int HYPER_LINKS_TYPE = 67;
 
 	/**
-	 * The number of structural features of the '<em>Hyper Links Type</em>' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IModelElementImpl <em>IModel Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IModelElementImpl
+	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.UMLRhapsodyPackageImpl#getIModelElement()
+	 * @generated
+	 */
+	int IMODEL_ELEMENT = 157;
+
+	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int HYPER_LINKS_TYPE_FEATURE_COUNT = 0;
+	int IMODEL_ELEMENT__DISPLAY_NAME = 0;
 
 	/**
-	 * The number of operations of the '<em>Hyper Links Type</em>' class.
+	 * The number of structural features of the '<em>IModel Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int HYPER_LINKS_TYPE_OPERATION_COUNT = 0;
+	int IMODEL_ELEMENT_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IModelElementImpl <em>IModel Element</em>}' class.
+	 * The number of operations of the '<em>IModel Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IModelElementImpl
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.UMLRhapsodyPackageImpl#getIModelElement()
 	 * @generated
+	 * @ordered
 	 */
-	int IMODEL_ELEMENT = 157;
+	int IMODEL_ELEMENT_OPERATION_COUNT = 0;
 
 	/**
-	 * The number of structural features of the '<em>IModel Element</em>' class.
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMODEL_ELEMENT_FEATURE_COUNT = 0;
+	int HYPER_LINKS_TYPE__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
 
 	/**
-	 * The number of operations of the '<em>IModel Element</em>' class.
+	 * The number of structural features of the '<em>Hyper Links Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMODEL_ELEMENT_OPERATION_COUNT = 0;
+	int HYPER_LINKS_TYPE_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Hyper Links Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HYPER_LINKS_TYPE_OPERATION_COUNT = IMODEL_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStateVertexImpl <em>IState Vertex</em>}' class.
@@ -10229,6 +10247,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTATE_VERTEX = 188;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISTATE_VERTEX__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -10329,6 +10356,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTATE = 185;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISTATE__DISPLAY_NAME = ISTATE_VERTEX__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -10473,22 +10509,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTATE__REQUIREMEN_TRACABILITY_HANDLE = ISTATE_VERTEX_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISTATE__DISPLAY_NAME = ISTATE_VERTEX_FEATURE_COUNT + 8;
-
-	/**
 	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ISTATE__ANNOTATIONS = ISTATE_VERTEX_FEATURE_COUNT + 9;
+	int ISTATE__ANNOTATIONS = ISTATE_VERTEX_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Dependencies</b></em>' containment reference.
@@ -10497,7 +10524,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISTATE__DEPENDENCIES = ISTATE_VERTEX_FEATURE_COUNT + 10;
+	int ISTATE__DEPENDENCIES = ISTATE_VERTEX_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>The Main Diagram</b></em>' reference.
@@ -10506,7 +10533,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISTATE__THE_MAIN_DIAGRAM = ISTATE_VERTEX_FEATURE_COUNT + 11;
+	int ISTATE__THE_MAIN_DIAGRAM = ISTATE_VERTEX_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Swimlane</b></em>' reference.
@@ -10515,7 +10542,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISTATE__SWIMLANE = ISTATE_VERTEX_FEATURE_COUNT + 12;
+	int ISTATE__SWIMLANE = ISTATE_VERTEX_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
@@ -10524,7 +10551,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISTATE__CODE_UPDATE_CG_TIME = ISTATE_VERTEX_FEATURE_COUNT + 13;
+	int ISTATE__CODE_UPDATE_CG_TIME = ISTATE_VERTEX_FEATURE_COUNT + 12;
 
 	/**
 	 * The number of structural features of the '<em>IState</em>' class.
@@ -10533,7 +10560,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISTATE_FEATURE_COUNT = ISTATE_VERTEX_FEATURE_COUNT + 14;
+	int ISTATE_FEATURE_COUNT = ISTATE_VERTEX_FEATURE_COUNT + 13;
 
 	/**
 	 * The number of operations of the '<em>IState</em>' class.
@@ -10555,6 +10582,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IACCEPT_EVENT_ACTION = 68;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IACCEPT_EVENT_ACTION__DISPLAY_NAME = ISTATE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -10699,15 +10735,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IACCEPT_EVENT_ACTION__REQUIREMEN_TRACABILITY_HANDLE = ISTATE__REQUIREMEN_TRACABILITY_HANDLE;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IACCEPT_EVENT_ACTION__DISPLAY_NAME = ISTATE__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -10790,6 +10817,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IACCEPT_TIME_EVENT = 69;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IACCEPT_TIME_EVENT__DISPLAY_NAME = ISTATE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -10934,15 +10970,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IACCEPT_TIME_EVENT__REQUIREMEN_TRACABILITY_HANDLE = ISTATE__REQUIREMEN_TRACABILITY_HANDLE;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IACCEPT_TIME_EVENT__DISPLAY_NAME = ISTATE__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -11016,6 +11043,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IACTION = 70;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IACTION__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -11344,13 +11380,22 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IACTIVITY_GRAPH__NAME = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 3;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IACTIVITY_GRAPH__DISPLAY_NAME = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 4;
+
+	/**
 	 * The feature id for the '<em><b>Last ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__LAST_ID = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 4;
+	int IACTIVITY_GRAPH__LAST_ID = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Weak CG Time</b></em>' attribute list.
@@ -11359,7 +11404,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__WEAK_CG_TIME = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 5;
+	int IACTIVITY_GRAPH__WEAK_CG_TIME = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Strong CG Time</b></em>' attribute list.
@@ -11368,7 +11413,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__STRONG_CG_TIME = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 6;
+	int IACTIVITY_GRAPH__STRONG_CG_TIME = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Multiplicity</b></em>' attribute.
@@ -11377,7 +11422,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__MULTIPLICITY = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 7;
+	int IACTIVITY_GRAPH__MULTIPLICITY = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Its State Chart</b></em>' reference list.
@@ -11386,7 +11431,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__ITS_STATE_CHART = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 8;
+	int IACTIVITY_GRAPH__ITS_STATE_CHART = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Class Modifier</b></em>' attribute.
@@ -11395,7 +11440,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__CLASS_MODIFIER = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 9;
+	int IACTIVITY_GRAPH__CLASS_MODIFIER = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>States</b></em>' containment reference list.
@@ -11404,7 +11449,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__STATES = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 10;
+	int IACTIVITY_GRAPH__STATES = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Base Version</b></em>' attribute.
@@ -11413,7 +11458,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__BASE_VERSION = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 11;
+	int IACTIVITY_GRAPH__BASE_VERSION = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 12;
 
 	/**
 	 * The feature id for the '<em><b>Diagram</b></em>' reference.
@@ -11422,7 +11467,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__DIAGRAM = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 12;
+	int IACTIVITY_GRAPH__DIAGRAM = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Views</b></em>' containment reference.
@@ -11431,7 +11476,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__VIEWS = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 13;
+	int IACTIVITY_GRAPH__VIEWS = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Properties</b></em>' containment reference.
@@ -11440,7 +11485,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__PROPERTIES = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 14;
+	int IACTIVITY_GRAPH__PROPERTIES = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 15;
 
 	/**
 	 * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
@@ -11449,7 +11494,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__REQUIREMEN_TRACABILITY_HANDLE = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 15;
+	int IACTIVITY_GRAPH__REQUIREMEN_TRACABILITY_HANDLE = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 16;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' containment reference.
@@ -11458,7 +11503,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__DESCRIPTION = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 16;
+	int IACTIVITY_GRAPH__DESCRIPTION = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 17;
 
 	/**
 	 * The feature id for the '<em><b>Swimlanes</b></em>' containment reference list.
@@ -11467,7 +11512,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__SWIMLANES = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 17;
+	int IACTIVITY_GRAPH__SWIMLANES = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 18;
 
 	/**
 	 * The feature id for the '<em><b>Stereotypes</b></em>' reference.
@@ -11476,7 +11521,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__STEREOTYPES = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 18;
+	int IACTIVITY_GRAPH__STEREOTYPES = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 19;
 
 	/**
 	 * The feature id for the '<em><b>Analysis Mode</b></em>' attribute.
@@ -11485,7 +11530,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__ANALYSIS_MODE = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 19;
+	int IACTIVITY_GRAPH__ANALYSIS_MODE = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 20;
 
 	/**
 	 * The feature id for the '<em><b>Annotations</b></em>' containment reference.
@@ -11494,7 +11539,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__ANNOTATIONS = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 20;
+	int IACTIVITY_GRAPH__ANNOTATIONS = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 21;
 
 	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
@@ -11503,7 +11548,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__CODE_UPDATE_CG_TIME = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 21;
+	int IACTIVITY_GRAPH__CODE_UPDATE_CG_TIME = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 22;
 
 	/**
 	 * The feature id for the '<em><b>Object Creation</b></em>' attribute.
@@ -11512,7 +11557,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__OBJECT_CREATION = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 22;
+	int IACTIVITY_GRAPH__OBJECT_CREATION = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 23;
 
 	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
@@ -11521,16 +11566,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IACTIVITY_GRAPH__UML_DEPENDENCY_ID = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 23;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IACTIVITY_GRAPH__DISPLAY_NAME = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 24;
+	int IACTIVITY_GRAPH__UML_DEPENDENCY_ID = NESTED_STATE_CHART_TYPE_FEATURE_COUNT + 24;
 
 	/**
 	 * The feature id for the '<em><b>Hyper Links</b></em>' containment reference.
@@ -11606,6 +11642,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IUNIT = 210;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IUNIT__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IUnit</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -11634,6 +11679,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICLASSIFIER = 90;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICLASSIFIER__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IClassifier</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -11662,6 +11716,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IACTOR = 73;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IACTOR__DISPLAY_NAME = ICLASSIFIER__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -12025,6 +12088,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IANNOTATION = 75;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IANNOTATION__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -12107,6 +12179,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IVARIABLE = 215;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IVARIABLE__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Ordered</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -12153,6 +12234,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IARGUMENT = 76;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IARGUMENT__DISPLAY_NAME = IVARIABLE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Ordered</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -12316,6 +12406,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICLASS = 87;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICLASS__DISPLAY_NAME = ICLASSIFIER__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -12685,22 +12784,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICLASS__CMHEADER = ICLASSIFIER_FEATURE_COUNT + 40;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICLASS__DISPLAY_NAME = ICLASSIFIER_FEATURE_COUNT + 41;
-
-	/**
 	 * The number of structural features of the '<em>IClass</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ICLASS_FEATURE_COUNT = ICLASSIFIER_FEATURE_COUNT + 42;
+	int ICLASS_FEATURE_COUNT = ICLASSIFIER_FEATURE_COUNT + 41;
 
 	/**
 	 * The number of operations of the '<em>IClass</em>' class.
@@ -12722,6 +12812,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IASSOCIATION_CLASS = 77;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IASSOCIATION_CLASS__DISPLAY_NAME = ICLASS__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -13091,15 +13190,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IASSOCIATION_CLASS__CMHEADER = ICLASS__CMHEADER;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IASSOCIATION_CLASS__DISPLAY_NAME = ICLASS__DISPLAY_NAME;
-
-	/**
 	 * The number of structural features of the '<em>IAssociation Class</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -13418,6 +13508,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IASSOCIATION_ROLE = 80;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IASSOCIATION_ROLE__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -13554,6 +13653,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IATTRIBUTE = 81;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IATTRIBUTE__DISPLAY_NAME = IVARIABLE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Ordered</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -14190,6 +14298,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICALL_OPERATION = 86;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICALL_OPERATION__DISPLAY_NAME = ISTATE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -14334,15 +14451,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICALL_OPERATION__REQUIREMEN_TRACABILITY_HANDLE = ISTATE__REQUIREMEN_TRACABILITY_HANDLE;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICALL_OPERATION__DISPLAY_NAME = ISTATE__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -14681,6 +14789,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICLASSIFIER_ROLE = 91;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICLASSIFIER_ROLE__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -14798,22 +14915,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICLASSIFIER_ROLE__UML_DEPENDENCY_ID = IMODEL_ELEMENT_FEATURE_COUNT + 12;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICLASSIFIER_ROLE__DISPLAY_NAME = IMODEL_ELEMENT_FEATURE_COUNT + 13;
-
-	/**
 	 * The number of structural features of the '<em>IClassifier Role</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ICLASSIFIER_ROLE_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 14;
+	int ICLASSIFIER_ROLE_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 13;
 
 	/**
 	 * The number of operations of the '<em>IClassifier Role</em>' class.
@@ -15251,6 +15359,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICOLLABORATION = 94;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICOLLABORATION__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -15387,6 +15504,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IDIAGRAM = 113;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDIAGRAM__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -15540,22 +15666,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IDIAGRAM__ANNOTATIONS = IUNIT_FEATURE_COUNT + 16;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IDIAGRAM__DISPLAY_NAME = IUNIT_FEATURE_COUNT + 17;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IDIAGRAM__CODE_UPDATE_CG_TIME = IUNIT_FEATURE_COUNT + 18;
+	int IDIAGRAM__CODE_UPDATE_CG_TIME = IUNIT_FEATURE_COUNT + 17;
 
 	/**
 	 * The feature id for the '<em><b>Hyper Links</b></em>' containment reference list.
@@ -15564,7 +15681,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IDIAGRAM__HYPER_LINKS = IUNIT_FEATURE_COUNT + 19;
+	int IDIAGRAM__HYPER_LINKS = IUNIT_FEATURE_COUNT + 18;
 
 	/**
 	 * The number of structural features of the '<em>IDiagram</em>' class.
@@ -15573,7 +15690,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IDIAGRAM_FEATURE_COUNT = IUNIT_FEATURE_COUNT + 20;
+	int IDIAGRAM_FEATURE_COUNT = IUNIT_FEATURE_COUNT + 19;
 
 	/**
 	 * The number of operations of the '<em>IDiagram</em>' class.
@@ -15595,6 +15712,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICOLLABORATION_DIAGRAM = 95;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICOLLABORATION_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -15748,15 +15874,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICOLLABORATION_DIAGRAM__ANNOTATIONS = IDIAGRAM__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICOLLABORATION_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -15967,6 +16084,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICOMMENT = 98;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICOMMENT__DISPLAY_NAME = IANNOTATION__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -16157,6 +16283,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICOMPONENT = 99;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICOMPONENT__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Weak CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -16464,6 +16599,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICOMPONENT_DIAGRAM = 100;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICOMPONENT_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -16617,15 +16761,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICOMPONENT_DIAGRAM__ANNOTATIONS = IDIAGRAM__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICOMPONENT_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -16672,6 +16807,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICOMPONENT_INSTANCE = 101;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICOMPONENT_INSTANCE__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IComponent Instance</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -16700,6 +16844,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICONFIGURATION = 102;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICONFIGURATION__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IConfiguration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -16728,6 +16881,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICONNECTOR = 103;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICONNECTOR__DISPLAY_NAME = ISTATE_VERTEX__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -16846,6 +17008,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICONSTRAINT = 104;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICONSTRAINT__DISPLAY_NAME = IANNOTATION__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -17254,6 +17425,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IVALUE_SPECIFICATION = 214;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IVALUE_SPECIFICATION__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IValue Specification</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -17282,6 +17462,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICONTEXT_SPECIFICATION = 106;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICONTEXT_SPECIFICATION__DISPLAY_NAME = IVALUE_SPECIFICATION__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IContext Specification</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -17310,6 +17499,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ICONTROLLED_FILE = 107;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICONTROLLED_FILE__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IControlled File</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -17528,6 +17726,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IDEPENDENCY = 109;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDEPENDENCY__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -17627,22 +17834,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IDEPENDENCY__ANNOTATIONS = IMODEL_ELEMENT_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IDEPENDENCY__DISPLAY_NAME = IMODEL_ELEMENT_FEATURE_COUNT + 11;
-
-	/**
 	 * The feature id for the '<em><b>Dependencies</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IDEPENDENCY__DEPENDENCIES = IMODEL_ELEMENT_FEATURE_COUNT + 12;
+	int IDEPENDENCY__DEPENDENCIES = IMODEL_ELEMENT_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' containment reference.
@@ -17651,7 +17849,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IDEPENDENCY__DESCRIPTION = IMODEL_ELEMENT_FEATURE_COUNT + 13;
+	int IDEPENDENCY__DESCRIPTION = IMODEL_ELEMENT_FEATURE_COUNT + 12;
 
 	/**
 	 * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
@@ -17660,7 +17858,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IDEPENDENCY__REQUIREMEN_TRACABILITY_HANDLE = IMODEL_ELEMENT_FEATURE_COUNT + 14;
+	int IDEPENDENCY__REQUIREMEN_TRACABILITY_HANDLE = IMODEL_ELEMENT_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
@@ -17669,7 +17867,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IDEPENDENCY__CODE_UPDATE_CG_TIME = IMODEL_ELEMENT_FEATURE_COUNT + 15;
+	int IDEPENDENCY__CODE_UPDATE_CG_TIME = IMODEL_ELEMENT_FEATURE_COUNT + 14;
 
 	/**
 	 * The number of structural features of the '<em>IDependency</em>' class.
@@ -17678,7 +17876,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IDEPENDENCY_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 16;
+	int IDEPENDENCY_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 15;
 
 	/**
 	 * The number of operations of the '<em>IDependency</em>' class.
@@ -17700,6 +17898,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IDEPLOYMENT_DIAGRAM = 110;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDEPLOYMENT_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -17853,15 +18060,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IDEPLOYMENT_DIAGRAM__ANNOTATIONS = IDIAGRAM__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IDEPLOYMENT_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -18244,6 +18442,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IENUMERATION_LITERAL = 115;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IENUMERATION_LITERAL__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -18344,6 +18551,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IINTERFACE_ITEM = 142;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IINTERFACE_ITEM__DISPLAY_NAME = ICLASSIFIER__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IInterface Item</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -18372,6 +18588,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IEVENT = 116;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IEVENT__DISPLAY_NAME = IINTERFACE_ITEM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -18525,22 +18750,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IEVENT__ANNOTATIONS = IINTERFACE_ITEM_FEATURE_COUNT + 16;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IEVENT__DISPLAY_NAME = IINTERFACE_ITEM_FEATURE_COUNT + 17;
-
-	/**
 	 * The number of structural features of the '<em>IEvent</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IEVENT_FEATURE_COUNT = IINTERFACE_ITEM_FEATURE_COUNT + 18;
+	int IEVENT_FEATURE_COUNT = IINTERFACE_ITEM_FEATURE_COUNT + 17;
 
 	/**
 	 * The number of operations of the '<em>IEvent</em>' class.
@@ -18644,6 +18860,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IEVENT_RECEPTION = 118;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IEVENT_RECEPTION__DISPLAY_NAME = IINTERFACE_ITEM__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IEvent Reception</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -18672,6 +18897,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IEXECUTION_OCCURRENCE = 119;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IEXECUTION_OCCURRENCE__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -18736,6 +18970,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IEXTERNAL_HYPERLINK = 120;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IEXTERNAL_HYPERLINK__DISPLAY_NAME = HYPER_LINKS_TYPE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Target</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -18773,6 +19016,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IFILE = 121;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IFILE__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -18918,6 +19170,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IFILE_FRAGMENT = 122;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IFILE_FRAGMENT__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -19090,6 +19351,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IFLOW = 123;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IFLOW__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IFlow</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -19118,6 +19388,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IFLOW_ITEM = 124;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IFLOW_ITEM__DISPLAY_NAME = ICLASSIFIER__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IFlow Item</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -19419,6 +19698,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IGENERALIZATION = 128;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IGENERALIZATION__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -19546,6 +19834,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IGUARD = 129;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IGUARD__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -19810,6 +20107,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IHYPER_LINK = 132;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IHYPER_LINK__DISPLAY_NAME = IDEPENDENCY__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -19909,15 +20215,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IHYPER_LINK__ANNOTATIONS = IDEPENDENCY__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHYPER_LINK__DISPLAY_NAME = IDEPENDENCY__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Dependencies</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -20308,6 +20605,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IRELATION = 180;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IRELATION__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IRelation</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -20336,6 +20642,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IINSTANCE = 135;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IINSTANCE__DISPLAY_NAME = IRELATION__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -20409,6 +20724,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IINSTANCE_SLOT = 136;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IINSTANCE_SLOT__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IInstance Slot</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -20437,6 +20761,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IINSTANCE_SPECIFICATION = 137;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IINSTANCE_SPECIFICATION__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IInstance Specification</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -20465,6 +20798,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IINSTANCE_VALUE = 138;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IINSTANCE_VALUE__DISPLAY_NAME = IVALUE_SPECIFICATION__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -20520,6 +20862,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IINTERACTION_OCCURRENCE = 139;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IINTERACTION_OCCURRENCE__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -20620,6 +20971,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IINTERACTION_OPERAND = 140;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IINTERACTION_OPERAND__DISPLAY_NAME = ICOLLABORATION__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -20783,6 +21143,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IINTERACTION_OPERATOR = 141;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IINTERACTION_OPERATOR__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IInteraction Operator</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -21011,6 +21380,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IINTERNAL_HYPERLINK = 144;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IINTERNAL_HYPERLINK__DISPLAY_NAME = HYPER_LINKS_TYPE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -21194,6 +21572,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ILINK = 146;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILINK__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -21367,6 +21754,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ILITERAL_SPECIFICATION = 148;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILITERAL_SPECIFICATION__DISPLAY_NAME = IVALUE_SPECIFICATION__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -21449,6 +21845,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IM_HYPER_LINK = 149;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IM_HYPER_LINK__DISPLAY_NAME = HYPER_LINKS_TYPE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -21521,22 +21926,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IM_HYPER_LINK__LINK_TARGET = HYPER_LINKS_TYPE_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IM_HYPER_LINK__DISPLAY_NAME = HYPER_LINKS_TYPE_FEATURE_COUNT + 8;
-
-	/**
 	 * The feature id for the '<em><b>Description</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IM_HYPER_LINK__DESCRIPTION = HYPER_LINKS_TYPE_FEATURE_COUNT + 9;
+	int IM_HYPER_LINK__DESCRIPTION = HYPER_LINKS_TYPE_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
@@ -21545,7 +21941,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IM_HYPER_LINK__REQUIREMEN_TRACABILITY_HANDLE = HYPER_LINKS_TYPE_FEATURE_COUNT + 10;
+	int IM_HYPER_LINK__REQUIREMEN_TRACABILITY_HANDLE = HYPER_LINKS_TYPE_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Object Creation</b></em>' attribute.
@@ -21554,7 +21950,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IM_HYPER_LINK__OBJECT_CREATION = HYPER_LINKS_TYPE_FEATURE_COUNT + 11;
+	int IM_HYPER_LINK__OBJECT_CREATION = HYPER_LINKS_TYPE_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
@@ -21563,7 +21959,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IM_HYPER_LINK__UML_DEPENDENCY_ID = HYPER_LINKS_TYPE_FEATURE_COUNT + 12;
+	int IM_HYPER_LINK__UML_DEPENDENCY_ID = HYPER_LINKS_TYPE_FEATURE_COUNT + 11;
 
 	/**
 	 * The number of structural features of the '<em>IM Hyper Link</em>' class.
@@ -21572,7 +21968,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IM_HYPER_LINK_FEATURE_COUNT = HYPER_LINKS_TYPE_FEATURE_COUNT + 13;
+	int IM_HYPER_LINK_FEATURE_COUNT = HYPER_LINKS_TYPE_FEATURE_COUNT + 12;
 
 	/**
 	 * The number of operations of the '<em>IM Hyper Link</em>' class.
@@ -21939,6 +22335,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IMATRIX_LAYOUT = 152;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMATRIX_LAYOUT__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -22039,6 +22444,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IMATRIX_VIEW = 153;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMATRIX_VIEW__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IMatrix View</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -22067,40 +22481,40 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IMESSAGE = 154;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__ID = IMODEL_ELEMENT_FEATURE_COUNT + 0;
+	int IMESSAGE__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
 
 	/**
-	 * The feature id for the '<em><b>My State</b></em>' attribute.
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MY_STATE = IMODEL_ELEMENT_FEATURE_COUNT + 1;
+	int IMESSAGE__ID = IMODEL_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * The feature id for the '<em><b>My State</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__NAME = IMODEL_ELEMENT_FEATURE_COUNT + 2;
+	int IMESSAGE__MY_STATE = IMODEL_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__DISPLAY_NAME = IMODEL_ELEMENT_FEATURE_COUNT + 3;
+	int IMESSAGE__NAME = IMODEL_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Msz Sequence</b></em>' attribute.
@@ -22109,7 +22523,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MSZ_SEQUENCE = IMODEL_ELEMENT_FEATURE_COUNT + 4;
+	int IMESSAGE__MSZ_SEQUENCE = IMODEL_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Msz Actual Args</b></em>' attribute.
@@ -22118,7 +22532,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MSZ_ACTUAL_ARGS = IMODEL_ELEMENT_FEATURE_COUNT + 5;
+	int IMESSAGE__MSZ_ACTUAL_ARGS = IMODEL_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Msz Return Val</b></em>' attribute.
@@ -22127,7 +22541,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MSZ_RETURN_VAL = IMODEL_ELEMENT_FEATURE_COUNT + 6;
+	int IMESSAGE__MSZ_RETURN_VAL = IMODEL_ELEMENT_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>MpReceiver</b></em>' reference.
@@ -22136,7 +22550,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MPRECEIVER = IMODEL_ELEMENT_FEATURE_COUNT + 7;
+	int IMESSAGE__MPRECEIVER = IMODEL_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>MpSender</b></em>' reference.
@@ -22145,7 +22559,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MPSENDER = IMODEL_ELEMENT_FEATURE_COUNT + 8;
+	int IMESSAGE__MPSENDER = IMODEL_ELEMENT_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>MpFormal Message</b></em>' reference.
@@ -22154,7 +22568,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MPFORMAL_MESSAGE = IMODEL_ELEMENT_FEATURE_COUNT + 9;
+	int IMESSAGE__MPFORMAL_MESSAGE = IMODEL_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>MeType</b></em>' attribute.
@@ -22163,7 +22577,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__METYPE = IMODEL_ELEMENT_FEATURE_COUNT + 10;
+	int IMESSAGE__METYPE = IMODEL_ELEMENT_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>MpCommunication Connection</b></em>' reference.
@@ -22172,7 +22586,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MPCOMMUNICATION_CONNECTION = IMODEL_ELEMENT_FEATURE_COUNT + 11;
+	int IMESSAGE__MPCOMMUNICATION_CONNECTION = IMODEL_ELEMENT_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Mfree Text</b></em>' attribute.
@@ -22181,7 +22595,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MFREE_TEXT = IMODEL_ELEMENT_FEATURE_COUNT + 12;
+	int IMESSAGE__MFREE_TEXT = IMODEL_ELEMENT_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute.
@@ -22190,7 +22604,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MODIFIED_TIME_WEAK = IMODEL_ELEMENT_FEATURE_COUNT + 13;
+	int IMESSAGE__MODIFIED_TIME_WEAK = IMODEL_ELEMENT_FEATURE_COUNT + 12;
 
 	/**
 	 * The feature id for the '<em><b>Stereotypes</b></em>' reference.
@@ -22199,7 +22613,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__STEREOTYPES = IMODEL_ELEMENT_FEATURE_COUNT + 14;
+	int IMESSAGE__STEREOTYPES = IMODEL_ELEMENT_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' containment reference list.
@@ -22208,7 +22622,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__TAGS = IMODEL_ELEMENT_FEATURE_COUNT + 15;
+	int IMESSAGE__TAGS = IMODEL_ELEMENT_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Properties</b></em>' containment reference.
@@ -22217,7 +22631,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__PROPERTIES = IMODEL_ELEMENT_FEATURE_COUNT + 16;
+	int IMESSAGE__PROPERTIES = IMODEL_ELEMENT_FEATURE_COUNT + 15;
 
 	/**
 	 * The feature id for the '<em><b>Mtarget Exec</b></em>' reference.
@@ -22226,7 +22640,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MTARGET_EXEC = IMODEL_ELEMENT_FEATURE_COUNT + 17;
+	int IMESSAGE__MTARGET_EXEC = IMODEL_ELEMENT_FEATURE_COUNT + 16;
 
 	/**
 	 * The feature id for the '<em><b>Msrc Exec</b></em>' reference.
@@ -22235,7 +22649,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__MSRC_EXEC = IMODEL_ELEMENT_FEATURE_COUNT + 18;
+	int IMESSAGE__MSRC_EXEC = IMODEL_ELEMENT_FEATURE_COUNT + 17;
 
 	/**
 	 * The feature id for the '<em><b>Object Creation</b></em>' attribute.
@@ -22244,7 +22658,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__OBJECT_CREATION = IMODEL_ELEMENT_FEATURE_COUNT + 19;
+	int IMESSAGE__OBJECT_CREATION = IMODEL_ELEMENT_FEATURE_COUNT + 18;
 
 	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
@@ -22253,7 +22667,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE__UML_DEPENDENCY_ID = IMODEL_ELEMENT_FEATURE_COUNT + 20;
+	int IMESSAGE__UML_DEPENDENCY_ID = IMODEL_ELEMENT_FEATURE_COUNT + 19;
 
 	/**
 	 * The number of structural features of the '<em>IMessage</em>' class.
@@ -22262,7 +22676,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMESSAGE_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 21;
+	int IMESSAGE_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 20;
 
 	/**
 	 * The number of operations of the '<em>IMessage</em>' class.
@@ -22284,6 +22698,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IMESSAGE_POINT = 155;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMESSAGE_POINT__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IMessage Point</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -22394,6 +22817,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IMODULE = 158;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMODULE__DISPLAY_NAME = IINSTANCE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -22594,6 +23026,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int INODE = 160;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INODE__DISPLAY_NAME = ICLASSIFIER__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>INode</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -22922,6 +23363,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IOBJECT_MODEL_DIAGRAM = 163;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IOBJECT_MODEL_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23075,15 +23525,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IOBJECT_MODEL_DIAGRAM__ANNOTATIONS = IDIAGRAM__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IOBJECT_MODEL_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23130,6 +23571,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IOBJECT_NODE = 164;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IOBJECT_NODE__DISPLAY_NAME = ISTATE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23274,15 +23724,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IOBJECT_NODE__REQUIREMEN_TRACABILITY_HANDLE = ISTATE__REQUIREMEN_TRACABILITY_HANDLE;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IOBJECT_NODE__DISPLAY_NAME = ISTATE__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23383,6 +23824,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IOPERATION = 165;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IOPERATION__DISPLAY_NAME = IINTERFACE_ITEM__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>IOperation</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23411,6 +23861,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPACKAGE = 166;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IPACKAGE__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23547,6 +24006,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPANEL_DIAGRAM = 167;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IPANEL_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23700,15 +24168,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPANEL_DIAGRAM__ANNOTATIONS = IDIAGRAM__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IPANEL_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23863,67 +24322,67 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPART__MULTIPLICITY = ASSOCIATIONS_TYPE_FEATURE_COUNT + 11;
 
 	/**
-	 * The feature id for the '<em><b>Stereotypes</b></em>' reference.
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IPART__STEREOTYPES = ASSOCIATIONS_TYPE_FEATURE_COUNT + 12;
+	int IPART__DISPLAY_NAME = ASSOCIATIONS_TYPE_FEATURE_COUNT + 12;
 
 	/**
-	 * The feature id for the '<em><b>Other Class</b></em>' reference.
+	 * The feature id for the '<em><b>Stereotypes</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IPART__OTHER_CLASS = ASSOCIATIONS_TYPE_FEATURE_COUNT + 13;
+	int IPART__STEREOTYPES = ASSOCIATIONS_TYPE_FEATURE_COUNT + 13;
 
 	/**
-	 * The feature id for the '<em><b>Inverse</b></em>' reference.
+	 * The feature id for the '<em><b>Other Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IPART__INVERSE = ASSOCIATIONS_TYPE_FEATURE_COUNT + 14;
+	int IPART__OTHER_CLASS = ASSOCIATIONS_TYPE_FEATURE_COUNT + 14;
 
 	/**
-	 * The feature id for the '<em><b>Dependencies</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Inverse</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IPART__DEPENDENCIES = ASSOCIATIONS_TYPE_FEATURE_COUNT + 15;
+	int IPART__INVERSE = ASSOCIATIONS_TYPE_FEATURE_COUNT + 15;
 
 	/**
-	 * The feature id for the '<em><b>Tags</b></em>' containment reference.
+	 * The feature id for the '<em><b>Dependencies</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IPART__TAGS = ASSOCIATIONS_TYPE_FEATURE_COUNT + 16;
+	int IPART__DEPENDENCIES = ASSOCIATIONS_TYPE_FEATURE_COUNT + 16;
 
 	/**
-	 * The feature id for the '<em><b>Initial Call Action</b></em>' containment reference.
+	 * The feature id for the '<em><b>Tags</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IPART__INITIAL_CALL_ACTION = ASSOCIATIONS_TYPE_FEATURE_COUNT + 17;
+	int IPART__TAGS = ASSOCIATIONS_TYPE_FEATURE_COUNT + 17;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Initial Call Action</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IPART__DISPLAY_NAME = ASSOCIATIONS_TYPE_FEATURE_COUNT + 18;
+	int IPART__INITIAL_CALL_ACTION = ASSOCIATIONS_TYPE_FEATURE_COUNT + 18;
 
 	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
@@ -23990,6 +24449,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPIN = 169;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IPIN__DISPLAY_NAME = ICONNECTOR__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -24135,6 +24603,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPORT = 170;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IPORT__DISPLAY_NAME = IINSTANCE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -24406,13 +24883,22 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPRIMITIVE_OPERATION__NAME = OPERATIONS_TYPE_FEATURE_COUNT + 5;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IPRIMITIVE_OPERATION__DISPLAY_NAME = OPERATIONS_TYPE_FEATURE_COUNT + 6;
+
+	/**
 	 * The feature id for the '<em><b>Properties</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__PROPERTIES = OPERATIONS_TYPE_FEATURE_COUNT + 6;
+	int IPRIMITIVE_OPERATION__PROPERTIES = OPERATIONS_TYPE_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Last ID</b></em>' attribute.
@@ -24421,7 +24907,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__LAST_ID = OPERATIONS_TYPE_FEATURE_COUNT + 7;
+	int IPRIMITIVE_OPERATION__LAST_ID = OPERATIONS_TYPE_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Args</b></em>' containment reference list.
@@ -24430,7 +24916,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__ARGS = OPERATIONS_TYPE_FEATURE_COUNT + 8;
+	int IPRIMITIVE_OPERATION__ARGS = OPERATIONS_TYPE_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Return Type</b></em>' reference.
@@ -24439,7 +24925,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__RETURN_TYPE = OPERATIONS_TYPE_FEATURE_COUNT + 9;
+	int IPRIMITIVE_OPERATION__RETURN_TYPE = OPERATIONS_TYPE_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Abstract</b></em>' attribute.
@@ -24448,7 +24934,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__ABSTRACT = OPERATIONS_TYPE_FEATURE_COUNT + 10;
+	int IPRIMITIVE_OPERATION__ABSTRACT = OPERATIONS_TYPE_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Final</b></em>' attribute.
@@ -24457,7 +24943,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__FINAL = OPERATIONS_TYPE_FEATURE_COUNT + 11;
+	int IPRIMITIVE_OPERATION__FINAL = OPERATIONS_TYPE_FEATURE_COUNT + 12;
 
 	/**
 	 * The feature id for the '<em><b>Concurrency</b></em>' attribute.
@@ -24466,7 +24952,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__CONCURRENCY = OPERATIONS_TYPE_FEATURE_COUNT + 12;
+	int IPRIMITIVE_OPERATION__CONCURRENCY = OPERATIONS_TYPE_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Protection</b></em>' attribute.
@@ -24475,7 +24961,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__PROTECTION = OPERATIONS_TYPE_FEATURE_COUNT + 13;
+	int IPRIMITIVE_OPERATION__PROTECTION = OPERATIONS_TYPE_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Static</b></em>' attribute.
@@ -24484,7 +24970,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__STATIC = OPERATIONS_TYPE_FEATURE_COUNT + 14;
+	int IPRIMITIVE_OPERATION__STATIC = OPERATIONS_TYPE_FEATURE_COUNT + 15;
 
 	/**
 	 * The feature id for the '<em><b>Constant</b></em>' attribute.
@@ -24493,7 +24979,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__CONSTANT = OPERATIONS_TYPE_FEATURE_COUNT + 15;
+	int IPRIMITIVE_OPERATION__CONSTANT = OPERATIONS_TYPE_FEATURE_COUNT + 16;
 
 	/**
 	 * The feature id for the '<em><b>Its Body</b></em>' containment reference.
@@ -24502,7 +24988,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__ITS_BODY = OPERATIONS_TYPE_FEATURE_COUNT + 16;
+	int IPRIMITIVE_OPERATION__ITS_BODY = OPERATIONS_TYPE_FEATURE_COUNT + 17;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' containment reference list.
@@ -24511,7 +24997,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__TAGS = OPERATIONS_TYPE_FEATURE_COUNT + 17;
+	int IPRIMITIVE_OPERATION__TAGS = OPERATIONS_TYPE_FEATURE_COUNT + 18;
 
 	/**
 	 * The feature id for the '<em><b>Annotations</b></em>' containment reference.
@@ -24520,7 +25006,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__ANNOTATIONS = OPERATIONS_TYPE_FEATURE_COUNT + 18;
+	int IPRIMITIVE_OPERATION__ANNOTATIONS = OPERATIONS_TYPE_FEATURE_COUNT + 19;
 
 	/**
 	 * The feature id for the '<em><b>Dependencies</b></em>' containment reference list.
@@ -24529,7 +25015,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__DEPENDENCIES = OPERATIONS_TYPE_FEATURE_COUNT + 19;
+	int IPRIMITIVE_OPERATION__DEPENDENCIES = OPERATIONS_TYPE_FEATURE_COUNT + 20;
 
 	/**
 	 * The feature id for the '<em><b>Stereotypes</b></em>' reference.
@@ -24538,7 +25024,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__STEREOTYPES = OPERATIONS_TYPE_FEATURE_COUNT + 20;
+	int IPRIMITIVE_OPERATION__STEREOTYPES = OPERATIONS_TYPE_FEATURE_COUNT + 21;
 
 	/**
 	 * The feature id for the '<em><b>My Return Type</b></em>' containment reference.
@@ -24547,7 +25033,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__MY_RETURN_TYPE = OPERATIONS_TYPE_FEATURE_COUNT + 21;
+	int IPRIMITIVE_OPERATION__MY_RETURN_TYPE = OPERATIONS_TYPE_FEATURE_COUNT + 22;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' containment reference.
@@ -24556,16 +25042,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IPRIMITIVE_OPERATION__DESCRIPTION = OPERATIONS_TYPE_FEATURE_COUNT + 22;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IPRIMITIVE_OPERATION__DISPLAY_NAME = OPERATIONS_TYPE_FEATURE_COUNT + 23;
+	int IPRIMITIVE_OPERATION__DESCRIPTION = OPERATIONS_TYPE_FEATURE_COUNT + 23;
 
 	/**
 	 * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
@@ -24650,6 +25127,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPROFILE = 172;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IPROFILE__DISPLAY_NAME = IPACKAGE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -24857,22 +25343,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPROFILE__LICENSE = IPACKAGE_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IPROFILE__DISPLAY_NAME = IPACKAGE_FEATURE_COUNT + 11;
-
-	/**
 	 * The number of structural features of the '<em>IProfile</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IPROFILE_FEATURE_COUNT = IPACKAGE_FEATURE_COUNT + 12;
+	int IPROFILE_FEATURE_COUNT = IPACKAGE_FEATURE_COUNT + 11;
 
 	/**
 	 * The number of operations of the '<em>IProfile</em>' class.
@@ -24894,6 +25371,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IPROJECT = 173;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IPROJECT__DISPLAY_NAME = IPACKAGE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -25676,6 +26162,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IREQUIREMENT = 181;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IREQUIREMENT__DISPLAY_NAME = IANNOTATION__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -25802,22 +26297,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IREQUIREMENT__REQ_ID = IANNOTATION_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IREQUIREMENT__DISPLAY_NAME = IANNOTATION_FEATURE_COUNT + 8;
-
-	/**
 	 * The feature id for the '<em><b>Dependencies</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IREQUIREMENT__DEPENDENCIES = IANNOTATION_FEATURE_COUNT + 9;
+	int IREQUIREMENT__DEPENDENCIES = IANNOTATION_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Anchors</b></em>' containment reference list.
@@ -25826,7 +26312,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IREQUIREMENT__ANCHORS = IANNOTATION_FEATURE_COUNT + 10;
+	int IREQUIREMENT__ANCHORS = IANNOTATION_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Hyper Links</b></em>' containment reference list.
@@ -25835,7 +26321,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IREQUIREMENT__HYPER_LINKS = IANNOTATION_FEATURE_COUNT + 11;
+	int IREQUIREMENT__HYPER_LINKS = IANNOTATION_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>The Main Diagram</b></em>' reference.
@@ -25844,7 +26330,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IREQUIREMENT__THE_MAIN_DIAGRAM = IANNOTATION_FEATURE_COUNT + 12;
+	int IREQUIREMENT__THE_MAIN_DIAGRAM = IANNOTATION_FEATURE_COUNT + 11;
 
 	/**
 	 * The number of structural features of the '<em>IRequirement</em>' class.
@@ -25853,7 +26339,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IREQUIREMENT_FEATURE_COUNT = IANNOTATION_FEATURE_COUNT + 13;
+	int IREQUIREMENT_FEATURE_COUNT = IANNOTATION_FEATURE_COUNT + 12;
 
 	/**
 	 * The number of operations of the '<em>IRequirement</em>' class.
@@ -25875,6 +26361,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISEND_ACTION = 182;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISEND_ACTION__DISPLAY_NAME = IACTION__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -25993,6 +26488,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISEQUENCE_DIAGRAM = 183;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISEQUENCE_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -26146,15 +26650,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISEQUENCE_DIAGRAM__ANNOTATIONS = IDIAGRAM__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISEQUENCE_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -26265,6 +26760,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTATE_CHART = 186;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISTATE_CHART__DISPLAY_NAME = ICLASS__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -26634,15 +27138,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTATE_CHART__CMHEADER = ICLASS__CMHEADER;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISTATE_CHART__DISPLAY_NAME = ICLASS__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Def Number</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -26770,6 +27265,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTATE_CHART_DIAGRAM = 187;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISTATE_CHART_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -26923,15 +27427,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTATE_CHART_DIAGRAM__ANNOTATIONS = IDIAGRAM__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISTATE_CHART_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -26978,6 +27473,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTEREOTYPE = 189;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISTEREOTYPE__DISPLAY_NAME = ICLASSIFIER__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -27095,22 +27599,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTEREOTYPE__REQUIREMEN_TRACABILITY_HANDLE = ICLASSIFIER_FEATURE_COUNT + 12;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISTEREOTYPE__DISPLAY_NAME = ICLASSIFIER_FEATURE_COUNT + 13;
-
-	/**
 	 * The feature id for the '<em><b>Object Creation</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ISTEREOTYPE__OBJECT_CREATION = ICLASSIFIER_FEATURE_COUNT + 14;
+	int ISTEREOTYPE__OBJECT_CREATION = ICLASSIFIER_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
@@ -27119,7 +27614,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISTEREOTYPE__UML_DEPENDENCY_ID = ICLASSIFIER_FEATURE_COUNT + 15;
+	int ISTEREOTYPE__UML_DEPENDENCY_ID = ICLASSIFIER_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>The Main Diagram</b></em>' reference.
@@ -27128,7 +27623,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISTEREOTYPE__THE_MAIN_DIAGRAM = ICLASSIFIER_FEATURE_COUNT + 16;
+	int ISTEREOTYPE__THE_MAIN_DIAGRAM = ICLASSIFIER_FEATURE_COUNT + 15;
 
 	/**
 	 * The feature id for the '<em><b>Annotations</b></em>' containment reference.
@@ -27137,7 +27632,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISTEREOTYPE__ANNOTATIONS = ICLASSIFIER_FEATURE_COUNT + 17;
+	int ISTEREOTYPE__ANNOTATIONS = ICLASSIFIER_FEATURE_COUNT + 16;
 
 	/**
 	 * The number of structural features of the '<em>IStereotype</em>' class.
@@ -27146,7 +27641,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISTEREOTYPE_FEATURE_COUNT = ICLASSIFIER_FEATURE_COUNT + 18;
+	int ISTEREOTYPE_FEATURE_COUNT = ICLASSIFIER_FEATURE_COUNT + 17;
 
 	/**
 	 * The number of operations of the '<em>IStereotype</em>' class.
@@ -27168,6 +27663,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTRUCTURE_DIAGRAM = 190;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISTRUCTURE_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -27321,15 +27825,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISTRUCTURE_DIAGRAM__ANNOTATIONS = IDIAGRAM__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISTRUCTURE_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -27440,13 +27935,22 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISUBSYSTEM__STRONG_CG_TIME = OWNER_HANDLE_TYPE__STRONG_CG_TIME;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISUBSYSTEM__DISPLAY_NAME = OWNER_HANDLE_TYPE_FEATURE_COUNT + 0;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__ID = OWNER_HANDLE_TYPE_FEATURE_COUNT + 0;
+	int ISUBSYSTEM__ID = OWNER_HANDLE_TYPE_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>My State</b></em>' attribute.
@@ -27455,7 +27959,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__MY_STATE = OWNER_HANDLE_TYPE_FEATURE_COUNT + 1;
+	int ISUBSYSTEM__MY_STATE = OWNER_HANDLE_TYPE_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -27464,7 +27968,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__NAME = OWNER_HANDLE_TYPE_FEATURE_COUNT + 2;
+	int ISUBSYSTEM__NAME = OWNER_HANDLE_TYPE_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
@@ -27473,7 +27977,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__MODIFIED_TIME_WEAK = OWNER_HANDLE_TYPE_FEATURE_COUNT + 3;
+	int ISUBSYSTEM__MODIFIED_TIME_WEAK = OWNER_HANDLE_TYPE_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Default Composite</b></em>' reference.
@@ -27482,7 +27986,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__DEFAULT_COMPOSITE = OWNER_HANDLE_TYPE_FEATURE_COUNT + 4;
+	int ISUBSYSTEM__DEFAULT_COMPOSITE = OWNER_HANDLE_TYPE_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Events Base ID</b></em>' attribute.
@@ -27491,7 +27995,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__EVENTS_BASE_ID = OWNER_HANDLE_TYPE_FEATURE_COUNT + 5;
+	int ISUBSYSTEM__EVENTS_BASE_ID = OWNER_HANDLE_TYPE_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Classes</b></em>' containment reference list.
@@ -27500,7 +28004,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__CLASSES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 6;
+	int ISUBSYSTEM__CLASSES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Configuration Related Time</b></em>' attribute list.
@@ -27509,7 +28013,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__CONFIGURATION_RELATED_TIME = OWNER_HANDLE_TYPE_FEATURE_COUNT + 7;
+	int ISUBSYSTEM__CONFIGURATION_RELATED_TIME = OWNER_HANDLE_TYPE_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Properties</b></em>' containment reference.
@@ -27518,7 +28022,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__PROPERTIES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 8;
+	int ISUBSYSTEM__PROPERTIES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Last ID</b></em>' attribute.
@@ -27527,7 +28031,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__LAST_ID = OWNER_HANDLE_TYPE_FEATURE_COUNT + 9;
+	int ISUBSYSTEM__LAST_ID = OWNER_HANDLE_TYPE_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Cmheader</b></em>' attribute.
@@ -27536,7 +28040,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__CMHEADER = OWNER_HANDLE_TYPE_FEATURE_COUNT + 10;
+	int ISUBSYSTEM__CMHEADER = OWNER_HANDLE_TYPE_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Declaratives</b></em>' containment reference list.
@@ -27545,7 +28049,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__DECLARATIVES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 11;
+	int ISUBSYSTEM__DECLARATIVES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 12;
 
 	/**
 	 * The feature id for the '<em><b>Types</b></em>' containment reference list.
@@ -27554,7 +28058,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__TYPES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 12;
+	int ISUBSYSTEM__TYPES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Stereotypes</b></em>' reference.
@@ -27563,7 +28067,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__STEREOTYPES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 13;
+	int ISUBSYSTEM__STEREOTYPES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Predefined Types</b></em>' attribute.
@@ -27572,7 +28076,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__PREDEFINED_TYPES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 14;
+	int ISUBSYSTEM__PREDEFINED_TYPES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 15;
 
 	/**
 	 * The feature id for the '<em><b>Events</b></em>' containment reference list.
@@ -27581,7 +28085,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__EVENTS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 15;
+	int ISUBSYSTEM__EVENTS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 16;
 
 	/**
 	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
@@ -27590,7 +28094,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__ANNOTATIONS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 16;
+	int ISUBSYSTEM__ANNOTATIONS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 17;
 
 	/**
 	 * The feature id for the '<em><b>Use Cases</b></em>' containment reference list.
@@ -27599,7 +28103,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__USE_CASES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 17;
+	int ISUBSYSTEM__USE_CASES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 18;
 
 	/**
 	 * The feature id for the '<em><b>Actors</b></em>' containment reference list.
@@ -27608,7 +28112,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__ACTORS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 18;
+	int ISUBSYSTEM__ACTORS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 19;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' containment reference.
@@ -27617,7 +28121,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__DESCRIPTION = OWNER_HANDLE_TYPE_FEATURE_COUNT + 19;
+	int ISUBSYSTEM__DESCRIPTION = OWNER_HANDLE_TYPE_FEATURE_COUNT + 20;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' containment reference list.
@@ -27626,7 +28130,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__TAGS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 20;
+	int ISUBSYSTEM__TAGS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 21;
 
 	/**
 	 * The feature id for the '<em><b>Association Elements</b></em>' reference list.
@@ -27635,7 +28139,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__ASSOCIATION_ELEMENTS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 21;
+	int ISUBSYSTEM__ASSOCIATION_ELEMENTS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 22;
 
 	/**
 	 * The feature id for the '<em><b>Dependencies</b></em>' containment reference list.
@@ -27644,7 +28148,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__DEPENDENCIES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 22;
+	int ISUBSYSTEM__DEPENDENCIES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 23;
 
 	/**
 	 * The feature id for the '<em><b>Owner Handle</b></em>' reference.
@@ -27653,7 +28157,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__OWNER_HANDLE = OWNER_HANDLE_TYPE_FEATURE_COUNT + 23;
+	int ISUBSYSTEM__OWNER_HANDLE = OWNER_HANDLE_TYPE_FEATURE_COUNT + 24;
 
 	/**
 	 * The feature id for the '<em><b>The Main Diagram</b></em>' reference.
@@ -27662,7 +28166,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__THE_MAIN_DIAGRAM = OWNER_HANDLE_TYPE_FEATURE_COUNT + 24;
+	int ISUBSYSTEM__THE_MAIN_DIAGRAM = OWNER_HANDLE_TYPE_FEATURE_COUNT + 25;
 
 	/**
 	 * The feature id for the '<em><b>Hyper Links</b></em>' containment reference.
@@ -27671,7 +28175,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__HYPER_LINKS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 25;
+	int ISUBSYSTEM__HYPER_LINKS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 26;
 
 	/**
 	 * The feature id for the '<em><b>Table Layouts</b></em>' containment reference list.
@@ -27680,7 +28184,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__TABLE_LAYOUTS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 26;
+	int ISUBSYSTEM__TABLE_LAYOUTS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 27;
 
 	/**
 	 * The feature id for the '<em><b>Matrix Layouts</b></em>' containment reference list.
@@ -27689,7 +28193,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__MATRIX_LAYOUTS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 27;
+	int ISUBSYSTEM__MATRIX_LAYOUTS = OWNER_HANDLE_TYPE_FEATURE_COUNT + 28;
 
 	/**
 	 * The feature id for the '<em><b>Table Instances</b></em>' containment reference list.
@@ -27698,7 +28202,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__TABLE_INSTANCES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 28;
+	int ISUBSYSTEM__TABLE_INSTANCES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 29;
 
 	/**
 	 * The feature id for the '<em><b>Matrix Instances</b></em>' containment reference list.
@@ -27707,7 +28211,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__MATRIX_INSTANCES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 29;
+	int ISUBSYSTEM__MATRIX_INSTANCES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 30;
 
 	/**
 	 * The feature id for the '<em><b>Embeded Files</b></em>' containment reference list.
@@ -27716,7 +28220,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__EMBEDED_FILES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 30;
+	int ISUBSYSTEM__EMBEDED_FILES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 31;
 
 	/**
 	 * The feature id for the '<em><b>Component Files</b></em>' containment reference list.
@@ -27725,7 +28229,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__COMPONENT_FILES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 31;
+	int ISUBSYSTEM__COMPONENT_FILES = OWNER_HANDLE_TYPE_FEATURE_COUNT + 32;
 
 	/**
 	 * The feature id for the '<em><b>Requiremen Tracability Handle</b></em>' attribute.
@@ -27734,7 +28238,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__REQUIREMEN_TRACABILITY_HANDLE = OWNER_HANDLE_TYPE_FEATURE_COUNT + 32;
+	int ISUBSYSTEM__REQUIREMEN_TRACABILITY_HANDLE = OWNER_HANDLE_TYPE_FEATURE_COUNT + 33;
 
 	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
@@ -27743,7 +28247,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__CODE_UPDATE_CG_TIME = OWNER_HANDLE_TYPE_FEATURE_COUNT + 33;
+	int ISUBSYSTEM__CODE_UPDATE_CG_TIME = OWNER_HANDLE_TYPE_FEATURE_COUNT + 34;
 
 	/**
 	 * The feature id for the '<em><b>Object Creation</b></em>' attribute.
@@ -27752,7 +28256,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__OBJECT_CREATION = OWNER_HANDLE_TYPE_FEATURE_COUNT + 34;
+	int ISUBSYSTEM__OBJECT_CREATION = OWNER_HANDLE_TYPE_FEATURE_COUNT + 35;
 
 	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
@@ -27761,16 +28265,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISUBSYSTEM__UML_DEPENDENCY_ID = OWNER_HANDLE_TYPE_FEATURE_COUNT + 35;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISUBSYSTEM__DISPLAY_NAME = OWNER_HANDLE_TYPE_FEATURE_COUNT + 36;
+	int ISUBSYSTEM__UML_DEPENDENCY_ID = OWNER_HANDLE_TYPE_FEATURE_COUNT + 36;
 
 	/**
 	 * The number of structural features of the '<em>ISubsystem</em>' class.
@@ -27801,6 +28296,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISWIMLANE = 192;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISWIMLANE__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -27882,22 +28386,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISWIMLANE__SWIMLANES = IMODEL_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISWIMLANE__DISPLAY_NAME = IMODEL_ELEMENT_FEATURE_COUNT + 9;
-
-	/**
 	 * The feature id for the '<em><b>Stereotypes</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ISWIMLANE__STEREOTYPES = IMODEL_ELEMENT_FEATURE_COUNT + 10;
+	int ISWIMLANE__STEREOTYPES = IMODEL_ELEMENT_FEATURE_COUNT + 9;
 
 	/**
 	 * The number of structural features of the '<em>ISwimlane</em>' class.
@@ -27906,7 +28401,7 @@ public interface UMLRhapsodyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ISWIMLANE_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 11;
+	int ISWIMLANE_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 10;
 
 	/**
 	 * The number of operations of the '<em>ISwimlane</em>' class.
@@ -27928,6 +28423,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ISYS_ML_PORT = 193;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISYS_ML_PORT__DISPLAY_NAME = IINSTANCE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -28219,6 +28723,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITABLE_LAYOUT = 195;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITABLE_LAYOUT__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -28337,6 +28850,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITABLE_VIEW = 196;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITABLE_VIEW__DISPLAY_NAME = IUNIT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>ITable View</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -28365,6 +28887,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITAG = 197;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITAG__DISPLAY_NAME = IVARIABLE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Ordered</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -28509,22 +29040,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITAG__CODE_UPDATE_CG_TIME = IVARIABLE_FEATURE_COUNT + 13;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITAG__DISPLAY_NAME = IVARIABLE_FEATURE_COUNT + 14;
-
-	/**
 	 * The number of structural features of the '<em>ITag</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ITAG_FEATURE_COUNT = IVARIABLE_FEATURE_COUNT + 15;
+	int ITAG_FEATURE_COUNT = IVARIABLE_FEATURE_COUNT + 14;
 
 	/**
 	 * The number of operations of the '<em>ITag</em>' class.
@@ -28692,6 +29214,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITEMPLATE_INSTANTIATION = 200;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITEMPLATE_INSTANTIATION__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>ITemplate Instantiation</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -28720,6 +29251,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITEMPLATE_INSTANTIATION_PARAMETER = 201;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITEMPLATE_INSTANTIATION_PARAMETER__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>ITemplate Instantiation Parameter</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -28748,6 +29288,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITEMPLATE_PARAMETER = 202;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITEMPLATE_PARAMETER__DISPLAY_NAME = IVARIABLE__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Ordered</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -29057,6 +29606,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITRANSITION = 205;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITRANSITION__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Modified Time Weak</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -29201,22 +29759,13 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITRANSITION__STEREOTYPES = IMODEL_ELEMENT_FEATURE_COUNT + 15;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITRANSITION__DISPLAY_NAME = IMODEL_ELEMENT_FEATURE_COUNT + 16;
-
-	/**
 	 * The number of structural features of the '<em>ITransition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ITRANSITION_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 17;
+	int ITRANSITION_FEATURE_COUNT = IMODEL_ELEMENT_FEATURE_COUNT + 16;
 
 	/**
 	 * The number of operations of the '<em>ITransition</em>' class.
@@ -29238,6 +29787,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITRIGGER = 206;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITRIGGER__DISPLAY_NAME = IMODEL_ELEMENT__DISPLAY_NAME;
+
+	/**
 	 * The number of structural features of the '<em>ITrigger</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -29275,31 +29833,31 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITRIGGERED__VIRTUAL = OPERATIONS_TYPE__VIRTUAL;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ITRIGGERED__ID = OPERATIONS_TYPE_FEATURE_COUNT + 0;
+	int ITRIGGERED__DISPLAY_NAME = OPERATIONS_TYPE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ITRIGGERED__NAME = OPERATIONS_TYPE_FEATURE_COUNT + 1;
+	int ITRIGGERED__ID = OPERATIONS_TYPE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ITRIGGERED__DISPLAY_NAME = OPERATIONS_TYPE_FEATURE_COUNT + 2;
+	int ITRIGGERED__NAME = OPERATIONS_TYPE_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Args</b></em>' containment reference list.
@@ -29402,6 +29960,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int ITYPE = 208;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITYPE__DISPLAY_NAME = ICLASSIFIER__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Uml Dependency ID</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -29945,6 +30512,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IUSE_CASE = 211;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IUSE_CASE__DISPLAY_NAME = ICLASSIFIER__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Multiplicity</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -30261,6 +30837,15 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IUSE_CASE_DIAGRAM = 212;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IUSE_CASE_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -30414,15 +30999,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	int IUSE_CASE_DIAGRAM__ANNOTATIONS = IDIAGRAM__ANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IUSE_CASE_DIAGRAM__DISPLAY_NAME = IDIAGRAM__DISPLAY_NAME;
-
-	/**
 	 * The feature id for the '<em><b>Code Update CG Time</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -39100,17 +39676,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getIActivityGraph_UmlDependencyID();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getDisplayName()
-	 * @see #getIActivityGraph()
-	 * @generated
-	 */
-	EAttribute getIActivityGraph_DisplayName();
-
-	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IActivityGraph#getHyperLinks <em>Hyper Links</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -41032,17 +41597,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getIClass_Cmheader();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClass#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClass#getDisplayName()
-	 * @see #getIClass()
-	 * @generated
-	 */
-	EAttribute getIClass_DisplayName();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassHandle <em>IClass Handle</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -41303,17 +41857,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getIClassifierRole_UmlDependencyID();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassifierRole#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClassifierRole#getDisplayName()
-	 * @see #getIClassifierRole()
-	 * @generated
-	 */
-	EAttribute getIClassifierRole_DisplayName();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ICodeGenConfigInfo <em>ICode Gen Config Info</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -43078,17 +43621,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EReference getIDependency_Annotations();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getDisplayName()
-	 * @see #getIDependency()
-	 * @generated
-	 */
-	EAttribute getIDependency_DisplayName();
-
-	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency#getDependencies <em>Dependencies</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -43426,17 +43958,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EReference getIDiagram_Annotations();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getDisplayName()
-	 * @see #getIDiagram()
-	 * @generated
-	 */
-	EAttribute getIDiagram_DisplayName();
-
-	/**
 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram#getCodeUpdateCGTime <em>Code Update CG Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -43808,17 +44329,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EReference getIEvent_Annotations();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEvent#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEvent#getDisplayName()
-	 * @see #getIEvent()
-	 * @generated
-	 */
-	EAttribute getIEvent_DisplayName();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IEventHandle <em>IEvent Handle</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -45909,17 +46419,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getIMHyperLink_LinkTarget();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getDisplayName()
-	 * @see #getIMHyperLink()
-	 * @generated
-	 */
-	EAttribute getIMHyperLink_DisplayName();
-
-	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -46454,17 +46953,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getIMessage_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getDisplayName()
-	 * @see #getIMessage()
-	 * @generated
-	 */
-	EAttribute getIMessage_DisplayName();
-
-	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMessage#getM_szSequence <em>Msz Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -46748,6 +47236,17 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EClass getIModelElement();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement#getDisplayName <em>Display Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Name</em>'.
+	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement#getDisplayName()
+	 * @see #getIModelElement()
+	 * @generated
+	 */
+	EAttribute getIModelElement_DisplayName();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModule <em>IModule</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -47419,17 +47918,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EReference getIPart_InitialCallAction();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getDisplayName()
-	 * @see #getIPart()
-	 * @generated
-	 */
-	EAttribute getIPart_DisplayName();
-
-	/**
 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart#getCodeUpdateCGTime <em>Code Update CG Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -47834,17 +48322,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EReference getIPrimitiveOperation_Description();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getDisplayName()
-	 * @see #getIPrimitiveOperation()
-	 * @generated
-	 */
-	EAttribute getIPrimitiveOperation_DisplayName();
-
-	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -48020,17 +48497,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getIProfile_License();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IProfile#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IProfile#getDisplayName()
-	 * @see #getIProfile()
-	 * @generated
-	 */
-	EAttribute getIProfile_DisplayName();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IProject <em>IProject</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -48748,17 +49214,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getIRequirement_ReqID();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getDisplayName()
-	 * @see #getIRequirement()
-	 * @generated
-	 */
-	EAttribute getIRequirement_DisplayName();
-
-	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IRequirement#getDependencies <em>Dependencies</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -49019,17 +49474,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getIState_RequiremenTracabilityHandle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getDisplayName()
-	 * @see #getIState()
-	 * @generated
-	 */
-	EAttribute getIState_DisplayName();
-
-	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IState#getAnnotations <em>Annotations</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -49367,17 +49811,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getIStereotype_RequiremenTracabilityHandle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getDisplayName()
-	 * @see #getIStereotype()
-	 * @generated
-	 */
-	EAttribute getIStereotype_DisplayName();
-
-	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IStereotype#getObjectCreation <em>Object Creation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -49838,17 +50271,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getISubsystem_UmlDependencyID();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISubsystem#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISubsystem#getDisplayName()
-	 * @see #getISubsystem()
-	 * @generated
-	 */
-	EAttribute getISubsystem_DisplayName();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane <em>ISwimlane</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -49958,17 +50380,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EReference getISwimlane_Swimlanes();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane#getDisplayName()
-	 * @see #getISwimlane()
-	 * @generated
-	 */
-	EAttribute getISwimlane_DisplayName();
-
-	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane#getStereotypes <em>Stereotypes</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -50426,17 +50837,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getITag_CodeUpdateCGTime();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag#getDisplayName()
-	 * @see #getITag()
-	 * @generated
-	 */
-	EAttribute getITag_DisplayName();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITemplateInst <em>ITemplate Inst</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -50847,17 +51247,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EReference getITransition_Stereotypes();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITransition#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITransition#getDisplayName()
-	 * @see #getITransition()
-	 * @generated
-	 */
-	EAttribute getITransition_DisplayName();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITrigger <em>ITrigger</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -50900,17 +51289,6 @@ public interface UMLRhapsodyPackage extends EPackage {
 	EAttribute getITriggered_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getDisplayName()
-	 * @see #getITriggered()
-	 * @generated
-	 */
-	EAttribute getITriggered_DisplayName();
-
-	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered#getArgs <em>Args</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/HyperLinksTypeImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/HyperLinksTypeImpl.java
index e2717ca9313..fca3333d48e 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/HyperLinksTypeImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/HyperLinksTypeImpl.java
@@ -13,9 +13,6 @@
 package org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.HyperLinksType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage;
 
@@ -26,7 +23,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *
  * @generated
  */
-public abstract class HyperLinksTypeImpl extends MinimalEObjectImpl.Container implements HyperLinksType {
+public abstract class HyperLinksTypeImpl extends IModelElementImpl implements HyperLinksType {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IActivityGraphImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IActivityGraphImpl.java
index 2639bcb34cc..91dfbd0323f 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IActivityGraphImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IActivityGraphImpl.java
@@ -40,6 +40,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDescription;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDiagram;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPropertyContainer;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISwimlane;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag;
@@ -62,6 +63,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ValueType;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getMyState <em>My State</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getLastID <em>Last ID</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getWeakCGTime <em>Weak CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getStrongCGTime <em>Strong CG Time</em>}</li>
@@ -82,7 +84,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ValueType;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getHyperLinks <em>Hyper Links</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IActivityGraphImpl#getTheMainDiagram <em>The Main Diagram</em>}</li>
@@ -164,6 +165,26 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 	protected String name = NAME_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DISPLAY_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String displayName = DISPLAY_NAME_EDEFAULT;
+
+	/**
 	 * The default value of the '{@link #getLastID() <em>Last ID</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -444,26 +465,6 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 	protected String umlDependencyID = UML_DEPENDENCY_ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The cached value of the '{@link #getHyperLinks() <em>Hyper Links</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1450,6 +1451,8 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 				return getMyState();
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__NAME:
 				return getName();
+			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
+				return getDisplayName();
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__LAST_ID:
 				return getLastID();
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__WEAK_CG_TIME:
@@ -1496,8 +1499,6 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 				return getObjectCreation();
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__UML_DEPENDENCY_ID:
 				return getUmlDependencyID();
-			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__HYPER_LINKS:
 				if (resolve) return getHyperLinks();
 				return basicGetHyperLinks();
@@ -1537,6 +1538,9 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__NAME:
 				setName((String)newValue);
 				return;
+			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
+				setDisplayName((String)newValue);
+				return;
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__LAST_ID:
 				setLastID((String)newValue);
 				return;
@@ -1603,9 +1607,6 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__UML_DEPENDENCY_ID:
 				setUmlDependencyID((String)newValue);
 				return;
-			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__HYPER_LINKS:
 				setHyperLinks((IMHyperLink)newValue);
 				return;
@@ -1647,6 +1648,9 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__NAME:
 				setName(NAME_EDEFAULT);
 				return;
+			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
+				setDisplayName(DISPLAY_NAME_EDEFAULT);
+				return;
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__LAST_ID:
 				setLastID(LAST_ID_EDEFAULT);
 				return;
@@ -1707,9 +1711,6 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__UML_DEPENDENCY_ID:
 				setUmlDependencyID(UML_DEPENDENCY_ID_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__HYPER_LINKS:
 				setHyperLinks((IMHyperLink)null);
 				return;
@@ -1745,6 +1746,8 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 				return MY_STATE_EDEFAULT == null ? myState != null : !MY_STATE_EDEFAULT.equals(myState);
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
+				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__LAST_ID:
 				return LAST_ID_EDEFAULT == null ? lastID != null : !LAST_ID_EDEFAULT.equals(lastID);
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__WEAK_CG_TIME:
@@ -1785,8 +1788,6 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 				return OBJECT_CREATION_EDEFAULT == null ? objectCreation != null : !OBJECT_CREATION_EDEFAULT.equals(objectCreation);
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__UML_DEPENDENCY_ID:
 				return UML_DEPENDENCY_ID_EDEFAULT == null ? umlDependencyID != null : !UML_DEPENDENCY_ID_EDEFAULT.equals(umlDependencyID);
-			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__HYPER_LINKS:
 				return hyperLinks != null;
 			case UMLRhapsodyPackage.IACTIVITY_GRAPH__DEPENDENCIES:
@@ -1837,6 +1838,12 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelElement.class) {
+			switch (derivedFeatureID) {
+				case UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME: return UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME;
+				default: return -1;
+			}
+		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
@@ -1876,6 +1883,12 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelElement.class) {
+			switch (baseFeatureID) {
+				case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME: return UMLRhapsodyPackage.IACTIVITY_GRAPH__DISPLAY_NAME;
+				default: return -1;
+			}
+		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
@@ -1897,6 +1910,8 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 		result.append(myState);
 		result.append(", name: "); //$NON-NLS-1$
 		result.append(name);
+		result.append(", displayName: "); //$NON-NLS-1$
+		result.append(displayName);
 		result.append(", lastID: "); //$NON-NLS-1$
 		result.append(lastID);
 		result.append(", weakCGTime: "); //$NON-NLS-1$
@@ -1919,8 +1934,6 @@ public class IActivityGraphImpl extends NestedStateChartTypeImpl implements IAct
 		result.append(objectCreation);
 		result.append(", umlDependencyID: "); //$NON-NLS-1$
 		result.append(umlDependencyID);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IClassImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IClassImpl.java
index b905ae282ba..6f6b6fef620 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IClassImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IClassImpl.java
@@ -111,7 +111,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ValueType;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IClassImpl#getTemplateParameters <em>Template Parameters</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IClassImpl#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IClassImpl#getCmheader <em>Cmheader</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IClassImpl#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -628,26 +627,6 @@ public class IClassImpl extends IClassifierImpl implements IClass {
 	protected String cmheader = CMHEADER_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1465,27 +1444,6 @@ public class IClassImpl extends IClassifierImpl implements IClass {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.ICLASS__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -1627,8 +1585,6 @@ public class IClassImpl extends IClassifierImpl implements IClass {
 				return getCodeUpdateCGTime();
 			case UMLRhapsodyPackage.ICLASS__CMHEADER:
 				return getCmheader();
-			case UMLRhapsodyPackage.ICLASS__DISPLAY_NAME:
-				return getDisplayName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -1790,9 +1746,6 @@ public class IClassImpl extends IClassifierImpl implements IClass {
 			case UMLRhapsodyPackage.ICLASS__CMHEADER:
 				setCmheader((String)newValue);
 				return;
-			case UMLRhapsodyPackage.ICLASS__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -1928,9 +1881,6 @@ public class IClassImpl extends IClassifierImpl implements IClass {
 			case UMLRhapsodyPackage.ICLASS__CMHEADER:
 				setCmheader(CMHEADER_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.ICLASS__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -2025,8 +1975,6 @@ public class IClassImpl extends IClassifierImpl implements IClass {
 				return codeUpdateCGTime != null && !codeUpdateCGTime.isEmpty();
 			case UMLRhapsodyPackage.ICLASS__CMHEADER:
 				return CMHEADER_EDEFAULT == null ? cmheader != null : !CMHEADER_EDEFAULT.equals(cmheader);
-			case UMLRhapsodyPackage.ICLASS__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -2193,8 +2141,6 @@ public class IClassImpl extends IClassifierImpl implements IClass {
 		result.append(codeUpdateCGTime);
 		result.append(", cmheader: "); //$NON-NLS-1$
 		result.append(cmheader);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IClassifierRoleImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IClassifierRoleImpl.java
index b8288f95254..fbd5c93ed2b 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IClassifierRoleImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IClassifierRoleImpl.java
@@ -55,7 +55,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IClassifierRoleImpl#getStereotypes <em>Stereotypes</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IClassifierRoleImpl#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IClassifierRoleImpl#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IClassifierRoleImpl#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -252,26 +251,6 @@ public class IClassifierRoleImpl extends IModelElementImpl implements IClassifie
 	protected String umlDependencyID = UML_DEPENDENCY_ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -663,27 +642,6 @@ public class IClassifierRoleImpl extends IModelElementImpl implements IClassifie
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.ICLASSIFIER_ROLE__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -732,8 +690,6 @@ public class IClassifierRoleImpl extends IModelElementImpl implements IClassifie
 				return getObjectCreation();
 			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__UML_DEPENDENCY_ID:
 				return getUmlDependencyID();
-			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__DISPLAY_NAME:
-				return getDisplayName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -788,9 +744,6 @@ public class IClassifierRoleImpl extends IModelElementImpl implements IClassifie
 			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__UML_DEPENDENCY_ID:
 				setUmlDependencyID((String)newValue);
 				return;
-			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -842,9 +795,6 @@ public class IClassifierRoleImpl extends IModelElementImpl implements IClassifie
 			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__UML_DEPENDENCY_ID:
 				setUmlDependencyID(UML_DEPENDENCY_ID_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -883,8 +833,6 @@ public class IClassifierRoleImpl extends IModelElementImpl implements IClassifie
 				return OBJECT_CREATION_EDEFAULT == null ? objectCreation != null : !OBJECT_CREATION_EDEFAULT.equals(objectCreation);
 			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__UML_DEPENDENCY_ID:
 				return UML_DEPENDENCY_ID_EDEFAULT == null ? umlDependencyID != null : !UML_DEPENDENCY_ID_EDEFAULT.equals(umlDependencyID);
-			case UMLRhapsodyPackage.ICLASSIFIER_ROLE__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -915,8 +863,6 @@ public class IClassifierRoleImpl extends IModelElementImpl implements IClassifie
 		result.append(objectCreation);
 		result.append(", umlDependencyID: "); //$NON-NLS-1$
 		result.append(umlDependencyID);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IDependencyImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IDependencyImpl.java
index 26cc962f280..e63b0014f3e 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IDependencyImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IDependencyImpl.java
@@ -56,7 +56,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDependencyImpl#getDependsOn <em>Depends On</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDependencyImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDependencyImpl#getAnnotations <em>Annotations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDependencyImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDependencyImpl#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDependencyImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDependencyImpl#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
@@ -227,26 +226,6 @@ public class IDependencyImpl extends IModelElementImpl implements IDependency {
 	protected IComment annotations;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The cached value of the '{@link #getDependencies() <em>Dependencies</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -711,27 +690,6 @@ public class IDependencyImpl extends IModelElementImpl implements IDependency {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IDEPENDENCY__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public IDependency getDependencies() {
 		if (dependencies != null && dependencies.eIsProxy()) {
 			InternalEObject oldDependencies = (InternalEObject)dependencies;
@@ -949,8 +907,6 @@ public class IDependencyImpl extends IModelElementImpl implements IDependency {
 			case UMLRhapsodyPackage.IDEPENDENCY__ANNOTATIONS:
 				if (resolve) return getAnnotations();
 				return basicGetAnnotations();
-			case UMLRhapsodyPackage.IDEPENDENCY__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.IDEPENDENCY__DEPENDENCIES:
 				if (resolve) return getDependencies();
 				return basicGetDependencies();
@@ -1008,9 +964,6 @@ public class IDependencyImpl extends IModelElementImpl implements IDependency {
 			case UMLRhapsodyPackage.IDEPENDENCY__ANNOTATIONS:
 				setAnnotations((IComment)newValue);
 				return;
-			case UMLRhapsodyPackage.IDEPENDENCY__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.IDEPENDENCY__DEPENDENCIES:
 				setDependencies((IDependency)newValue);
 				return;
@@ -1069,9 +1022,6 @@ public class IDependencyImpl extends IModelElementImpl implements IDependency {
 			case UMLRhapsodyPackage.IDEPENDENCY__ANNOTATIONS:
 				setAnnotations((IComment)null);
 				return;
-			case UMLRhapsodyPackage.IDEPENDENCY__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.IDEPENDENCY__DEPENDENCIES:
 				setDependencies((IDependency)null);
 				return;
@@ -1118,8 +1068,6 @@ public class IDependencyImpl extends IModelElementImpl implements IDependency {
 				return tags != null;
 			case UMLRhapsodyPackage.IDEPENDENCY__ANNOTATIONS:
 				return annotations != null;
-			case UMLRhapsodyPackage.IDEPENDENCY__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IDEPENDENCY__DEPENDENCIES:
 				return dependencies != null;
 			case UMLRhapsodyPackage.IDEPENDENCY__DESCRIPTION:
@@ -1208,8 +1156,6 @@ public class IDependencyImpl extends IModelElementImpl implements IDependency {
 		result.append(name);
 		result.append(", modifiedTimeWeak: "); //$NON-NLS-1$
 		result.append(modifiedTimeWeak);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(", requiremenTracabilityHandle: "); //$NON-NLS-1$
 		result.append(requiremenTracabilityHandle);
 		result.append(", codeUpdateCGTime: "); //$NON-NLS-1$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IDiagramImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IDiagramImpl.java
index e6831e6c442..0dcebba4f37 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IDiagramImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IDiagramImpl.java
@@ -70,7 +70,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDiagramImpl#getModifiedTimeWeak <em>Modified Time Weak</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDiagramImpl#getGraphicChart <em>Graphic Chart</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDiagramImpl#getAnnotations <em>Annotations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDiagramImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDiagramImpl#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IDiagramImpl#getHyperLinks <em>Hyper Links</em>}</li>
  * </ul>
@@ -339,26 +338,6 @@ public class IDiagramImpl extends IUnitImpl implements IDiagram {
 	protected EList<IAnnotation> annotations;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The cached value of the '{@link #getCodeUpdateCGTime() <em>Code Update CG Time</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -927,27 +906,6 @@ public class IDiagramImpl extends IUnitImpl implements IDiagram {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IDIAGRAM__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EList<String> getCodeUpdateCGTime() {
 		if (codeUpdateCGTime == null) {
 			codeUpdateCGTime = new EDataTypeEList<String>(String.class, this, UMLRhapsodyPackage.IDIAGRAM__CODE_UPDATE_CG_TIME);
@@ -1037,8 +995,6 @@ public class IDiagramImpl extends IUnitImpl implements IDiagram {
 				return basicGetGraphicChart();
 			case UMLRhapsodyPackage.IDIAGRAM__ANNOTATIONS:
 				return getAnnotations();
-			case UMLRhapsodyPackage.IDIAGRAM__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.IDIAGRAM__CODE_UPDATE_CG_TIME:
 				return getCodeUpdateCGTime();
 			case UMLRhapsodyPackage.IDIAGRAM__HYPER_LINKS:
@@ -1109,9 +1065,6 @@ public class IDiagramImpl extends IUnitImpl implements IDiagram {
 				getAnnotations().clear();
 				getAnnotations().addAll((Collection<? extends IAnnotation>)newValue);
 				return;
-			case UMLRhapsodyPackage.IDIAGRAM__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.IDIAGRAM__CODE_UPDATE_CG_TIME:
 				getCodeUpdateCGTime().clear();
 				getCodeUpdateCGTime().addAll((Collection<? extends String>)newValue);
@@ -1183,9 +1136,6 @@ public class IDiagramImpl extends IUnitImpl implements IDiagram {
 			case UMLRhapsodyPackage.IDIAGRAM__ANNOTATIONS:
 				getAnnotations().clear();
 				return;
-			case UMLRhapsodyPackage.IDIAGRAM__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.IDIAGRAM__CODE_UPDATE_CG_TIME:
 				getCodeUpdateCGTime().clear();
 				return;
@@ -1238,8 +1188,6 @@ public class IDiagramImpl extends IUnitImpl implements IDiagram {
 				return graphicChart != null;
 			case UMLRhapsodyPackage.IDIAGRAM__ANNOTATIONS:
 				return annotations != null && !annotations.isEmpty();
-			case UMLRhapsodyPackage.IDIAGRAM__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IDIAGRAM__CODE_UPDATE_CG_TIME:
 				return codeUpdateCGTime != null && !codeUpdateCGTime.isEmpty();
 			case UMLRhapsodyPackage.IDIAGRAM__HYPER_LINKS:
@@ -1382,8 +1330,6 @@ public class IDiagramImpl extends IUnitImpl implements IDiagram {
 		result.append(cmheader);
 		result.append(", modifiedTimeWeak: "); //$NON-NLS-1$
 		result.append(modifiedTimeWeak);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(", codeUpdateCGTime: "); //$NON-NLS-1$
 		result.append(codeUpdateCGTime);
 		result.append(')');
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IEventImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IEventImpl.java
index e8b65423fc2..46ce05fef6b 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IEventImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IEventImpl.java
@@ -69,7 +69,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UnknownType;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IEventImpl#getSuperEvent <em>Super Event</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IEventImpl#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IEventImpl#getAnnotations <em>Annotations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IEventImpl#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -326,26 +325,6 @@ public class IEventImpl extends IInterfaceItemImpl implements IEvent {
 	protected IConstraint annotations;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -887,27 +866,6 @@ public class IEventImpl extends IInterfaceItemImpl implements IEvent {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IEVENT__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -974,8 +932,6 @@ public class IEventImpl extends IInterfaceItemImpl implements IEvent {
 			case UMLRhapsodyPackage.IEVENT__ANNOTATIONS:
 				if (resolve) return getAnnotations();
 				return basicGetAnnotations();
-			case UMLRhapsodyPackage.IEVENT__DISPLAY_NAME:
-				return getDisplayName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -1044,9 +1000,6 @@ public class IEventImpl extends IInterfaceItemImpl implements IEvent {
 			case UMLRhapsodyPackage.IEVENT__ANNOTATIONS:
 				setAnnotations((IConstraint)newValue);
 				return;
-			case UMLRhapsodyPackage.IEVENT__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -1110,9 +1063,6 @@ public class IEventImpl extends IInterfaceItemImpl implements IEvent {
 			case UMLRhapsodyPackage.IEVENT__ANNOTATIONS:
 				setAnnotations((IConstraint)null);
 				return;
-			case UMLRhapsodyPackage.IEVENT__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -1159,8 +1109,6 @@ public class IEventImpl extends IInterfaceItemImpl implements IEvent {
 				return REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT == null ? requiremenTracabilityHandle != null : !REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT.equals(requiremenTracabilityHandle);
 			case UMLRhapsodyPackage.IEVENT__ANNOTATIONS:
 				return annotations != null;
-			case UMLRhapsodyPackage.IEVENT__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -1259,8 +1207,6 @@ public class IEventImpl extends IInterfaceItemImpl implements IEvent {
 		result.append(modifiedTimeWeak);
 		result.append(", requiremenTracabilityHandle: "); //$NON-NLS-1$
 		result.append(requiremenTracabilityHandle);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IMHyperLinkImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IMHyperLinkImpl.java
index 7e6f8c700b3..aad71ab8f27 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IMHyperLinkImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IMHyperLinkImpl.java
@@ -48,7 +48,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMHyperLinkImpl#getLinkType <em>Link Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMHyperLinkImpl#getIsConfigurationFileHyperLink <em>Is Configuration File Hyper Link</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMHyperLinkImpl#getLinkTarget <em>Link Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMHyperLinkImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMHyperLinkImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMHyperLinkImpl#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMHyperLinkImpl#getObjectCreation <em>Object Creation</em>}</li>
@@ -189,26 +188,6 @@ public class IMHyperLinkImpl extends HyperLinksTypeImpl implements IMHyperLink {
 	protected String linkTarget = LINK_TARGET_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The cached value of the '{@link #getDescription() <em>Description</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -523,27 +502,6 @@ public class IMHyperLinkImpl extends HyperLinksTypeImpl implements IMHyperLink {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IM_HYPER_LINK__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public IDescription getDescription() {
 		if (description != null && description.eIsProxy()) {
 			InternalEObject oldDescription = (InternalEObject)description;
@@ -710,8 +668,6 @@ public class IMHyperLinkImpl extends HyperLinksTypeImpl implements IMHyperLink {
 				return getIsConfigurationFileHyperLink();
 			case UMLRhapsodyPackage.IM_HYPER_LINK__LINK_TARGET:
 				return getLinkTarget();
-			case UMLRhapsodyPackage.IM_HYPER_LINK__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.IM_HYPER_LINK__DESCRIPTION:
 				if (resolve) return getDescription();
 				return basicGetDescription();
@@ -759,9 +715,6 @@ public class IMHyperLinkImpl extends HyperLinksTypeImpl implements IMHyperLink {
 			case UMLRhapsodyPackage.IM_HYPER_LINK__LINK_TARGET:
 				setLinkTarget((String)newValue);
 				return;
-			case UMLRhapsodyPackage.IM_HYPER_LINK__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.IM_HYPER_LINK__DESCRIPTION:
 				setDescription((IDescription)newValue);
 				return;
@@ -810,9 +763,6 @@ public class IMHyperLinkImpl extends HyperLinksTypeImpl implements IMHyperLink {
 			case UMLRhapsodyPackage.IM_HYPER_LINK__LINK_TARGET:
 				setLinkTarget(LINK_TARGET_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.IM_HYPER_LINK__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.IM_HYPER_LINK__DESCRIPTION:
 				setDescription((IDescription)null);
 				return;
@@ -853,8 +803,6 @@ public class IMHyperLinkImpl extends HyperLinksTypeImpl implements IMHyperLink {
 				return IS_CONFIGURATION_FILE_HYPER_LINK_EDEFAULT == null ? isConfigurationFileHyperLink != null : !IS_CONFIGURATION_FILE_HYPER_LINK_EDEFAULT.equals(isConfigurationFileHyperLink);
 			case UMLRhapsodyPackage.IM_HYPER_LINK__LINK_TARGET:
 				return LINK_TARGET_EDEFAULT == null ? linkTarget != null : !LINK_TARGET_EDEFAULT.equals(linkTarget);
-			case UMLRhapsodyPackage.IM_HYPER_LINK__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IM_HYPER_LINK__DESCRIPTION:
 				return description != null;
 			case UMLRhapsodyPackage.IM_HYPER_LINK__REQUIREMEN_TRACABILITY_HANDLE:
@@ -889,8 +837,6 @@ public class IMHyperLinkImpl extends HyperLinksTypeImpl implements IMHyperLink {
 		result.append(isConfigurationFileHyperLink);
 		result.append(", linkTarget: "); //$NON-NLS-1$
 		result.append(linkTarget);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(", requiremenTracabilityHandle: "); //$NON-NLS-1$
 		result.append(requiremenTracabilityHandle);
 		result.append(", objectCreation: "); //$NON-NLS-1$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IMessageImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IMessageImpl.java
index 2427852bcd0..ac3676f1087 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IMessageImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IMessageImpl.java
@@ -47,7 +47,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMessageImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMessageImpl#getMyState <em>My State</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMessageImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMessageImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMessageImpl#getM_szSequence <em>Msz Sequence</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMessageImpl#getM_szActualArgs <em>Msz Actual Args</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IMessageImpl#getM_szReturnVal <em>Msz Return Val</em>}</li>
@@ -131,26 +130,6 @@ public class IMessageImpl extends IModelElementImpl implements IMessage {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The default value of the '{@link #getM_szSequence() <em>Msz Sequence</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -487,27 +466,6 @@ public class IMessageImpl extends IModelElementImpl implements IMessage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IMESSAGE__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public String getM_szSequence() {
 		return m_szSequence;
 	}
@@ -1045,8 +1003,6 @@ public class IMessageImpl extends IModelElementImpl implements IMessage {
 				return getMyState();
 			case UMLRhapsodyPackage.IMESSAGE__NAME:
 				return getName();
-			case UMLRhapsodyPackage.IMESSAGE__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.IMESSAGE__MSZ_SEQUENCE:
 				return getM_szSequence();
 			case UMLRhapsodyPackage.IMESSAGE__MSZ_ACTUAL_ARGS:
@@ -1111,9 +1067,6 @@ public class IMessageImpl extends IModelElementImpl implements IMessage {
 			case UMLRhapsodyPackage.IMESSAGE__NAME:
 				setName((String)newValue);
 				return;
-			case UMLRhapsodyPackage.IMESSAGE__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.IMESSAGE__MSZ_SEQUENCE:
 				setM_szSequence((String)newValue);
 				return;
@@ -1187,9 +1140,6 @@ public class IMessageImpl extends IModelElementImpl implements IMessage {
 			case UMLRhapsodyPackage.IMESSAGE__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.IMESSAGE__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.IMESSAGE__MSZ_SEQUENCE:
 				setM_szSequence(MSZ_SEQUENCE_EDEFAULT);
 				return;
@@ -1259,8 +1209,6 @@ public class IMessageImpl extends IModelElementImpl implements IMessage {
 				return MY_STATE_EDEFAULT == null ? myState != null : !MY_STATE_EDEFAULT.equals(myState);
 			case UMLRhapsodyPackage.IMESSAGE__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case UMLRhapsodyPackage.IMESSAGE__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IMESSAGE__MSZ_SEQUENCE:
 				return MSZ_SEQUENCE_EDEFAULT == null ? m_szSequence != null : !MSZ_SEQUENCE_EDEFAULT.equals(m_szSequence);
 			case UMLRhapsodyPackage.IMESSAGE__MSZ_ACTUAL_ARGS:
@@ -1315,8 +1263,6 @@ public class IMessageImpl extends IModelElementImpl implements IMessage {
 		result.append(myState);
 		result.append(", name: "); //$NON-NLS-1$
 		result.append(name);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(", m_szSequence: "); //$NON-NLS-1$
 		result.append(m_szSequence);
 		result.append(", m_szActualArgs: "); //$NON-NLS-1$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IModelElementImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IModelElementImpl.java
index c96155f9e54..8b6f4f7f4d0 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IModelElementImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IModelElementImpl.java
@@ -12,8 +12,10 @@
  */
 package org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl;
 
+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;
 
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement;
@@ -23,11 +25,36 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>IModel Element</b></em>'.
  * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IModelElementImpl#getDisplayName <em>Display Name</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class IModelElementImpl extends MinimalEObjectImpl.Container implements IModelElement {
 	/**
+	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DISPLAY_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String displayName = DISPLAY_NAME_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -46,4 +73,99 @@ public class IModelElementImpl extends MinimalEObjectImpl.Container implements I
 		return UMLRhapsodyPackage.eINSTANCE.getIModelElement();
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDisplayName(String newDisplayName) {
+		String oldDisplayName = displayName;
+		displayName = newDisplayName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME, oldDisplayName, displayName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME:
+				return getDisplayName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME:
+				setDisplayName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME:
+				setDisplayName(DISPLAY_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME:
+				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (displayName: "); //$NON-NLS-1$
+		result.append(displayName);
+		result.append(')');
+		return result.toString();
+	}
+
 } //IModelElementImpl
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPartImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPartImpl.java
index dd6688933a4..15a168c7fdb 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPartImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPartImpl.java
@@ -39,6 +39,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClass;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDescription;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMHyperLink;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPart;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPropertyContainer;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISlot;
@@ -73,13 +74,13 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ValueType;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getImplicitClass <em>Implicit Class</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getLastID <em>Last ID</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getStereotypes <em>Stereotypes</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getOtherClass <em>Other Class</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getInverse <em>Inverse</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getInitialCallAction <em>Initial Call Action</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getTheMainDiagram <em>The Main Diagram</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPartImpl#getSlots <em>Slots</em>}</li>
@@ -290,6 +291,26 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 	protected String multiplicity = MULTIPLICITY_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DISPLAY_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String displayName = DISPLAY_NAME_EDEFAULT;
+
+	/**
 	 * The cached value of the '{@link #getStereotypes() <em>Stereotypes</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -350,26 +371,6 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 	protected ICallAction initialCallAction;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The cached value of the '{@link #getCodeUpdateCGTime() <em>Code Update CG Time</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1276,6 +1277,8 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 				return getLastID();
 			case UMLRhapsodyPackage.IPART__MULTIPLICITY:
 				return getMultiplicity();
+			case UMLRhapsodyPackage.IPART__DISPLAY_NAME:
+				return getDisplayName();
 			case UMLRhapsodyPackage.IPART__STEREOTYPES:
 				if (resolve) return getStereotypes();
 				return basicGetStereotypes();
@@ -1293,8 +1296,6 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 			case UMLRhapsodyPackage.IPART__INITIAL_CALL_ACTION:
 				if (resolve) return getInitialCallAction();
 				return basicGetInitialCallAction();
-			case UMLRhapsodyPackage.IPART__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.IPART__CODE_UPDATE_CG_TIME:
 				return getCodeUpdateCGTime();
 			case UMLRhapsodyPackage.IPART__THE_MAIN_DIAGRAM:
@@ -1355,6 +1356,9 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 			case UMLRhapsodyPackage.IPART__MULTIPLICITY:
 				setMultiplicity((String)newValue);
 				return;
+			case UMLRhapsodyPackage.IPART__DISPLAY_NAME:
+				setDisplayName((String)newValue);
+				return;
 			case UMLRhapsodyPackage.IPART__STEREOTYPES:
 				setStereotypes((IUnit)newValue);
 				return;
@@ -1374,9 +1378,6 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 			case UMLRhapsodyPackage.IPART__INITIAL_CALL_ACTION:
 				setInitialCallAction((ICallAction)newValue);
 				return;
-			case UMLRhapsodyPackage.IPART__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.IPART__CODE_UPDATE_CG_TIME:
 				getCodeUpdateCGTime().clear();
 				getCodeUpdateCGTime().addAll((Collection<? extends String>)newValue);
@@ -1439,6 +1440,9 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 			case UMLRhapsodyPackage.IPART__MULTIPLICITY:
 				setMultiplicity(MULTIPLICITY_EDEFAULT);
 				return;
+			case UMLRhapsodyPackage.IPART__DISPLAY_NAME:
+				setDisplayName(DISPLAY_NAME_EDEFAULT);
+				return;
 			case UMLRhapsodyPackage.IPART__STEREOTYPES:
 				setStereotypes((IUnit)null);
 				return;
@@ -1457,9 +1461,6 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 			case UMLRhapsodyPackage.IPART__INITIAL_CALL_ACTION:
 				setInitialCallAction((ICallAction)null);
 				return;
-			case UMLRhapsodyPackage.IPART__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.IPART__CODE_UPDATE_CG_TIME:
 				getCodeUpdateCGTime().clear();
 				return;
@@ -1508,6 +1509,8 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 				return LAST_ID_EDEFAULT == null ? lastID != null : !LAST_ID_EDEFAULT.equals(lastID);
 			case UMLRhapsodyPackage.IPART__MULTIPLICITY:
 				return MULTIPLICITY_EDEFAULT == null ? multiplicity != null : !MULTIPLICITY_EDEFAULT.equals(multiplicity);
+			case UMLRhapsodyPackage.IPART__DISPLAY_NAME:
+				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IPART__STEREOTYPES:
 				return stereotypes != null;
 			case UMLRhapsodyPackage.IPART__OTHER_CLASS:
@@ -1520,8 +1523,6 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 				return tags != null;
 			case UMLRhapsodyPackage.IPART__INITIAL_CALL_ACTION:
 				return initialCallAction != null;
-			case UMLRhapsodyPackage.IPART__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IPART__CODE_UPDATE_CG_TIME:
 				return codeUpdateCGTime != null && !codeUpdateCGTime.isEmpty();
 			case UMLRhapsodyPackage.IPART__THE_MAIN_DIAGRAM:
@@ -1613,6 +1614,12 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelElement.class) {
+			switch (derivedFeatureID) {
+				case UMLRhapsodyPackage.IPART__DISPLAY_NAME: return UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME;
+				default: return -1;
+			}
+		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
@@ -1695,6 +1702,12 @@ public class IPartImpl extends AssociationsTypeImpl implements IPart {
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelElement.class) {
+			switch (baseFeatureID) {
+				case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME: return UMLRhapsodyPackage.IPART__DISPLAY_NAME;
+				default: return -1;
+			}
+		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPrimitiveOperationImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPrimitiveOperationImpl.java
index b2ee596ff6d..202a3cf8e1e 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPrimitiveOperationImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IPrimitiveOperationImpl.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IComment;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDependency;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IDescription;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IMSC;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPrimitiveOperation;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPropertyContainer;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag;
@@ -66,6 +67,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ValueType;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getMyState <em>My State</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getProperties <em>Properties</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getLastID <em>Last ID</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getArgs <em>Args</em>}</li>
@@ -83,7 +85,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ValueType;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getStereotypes <em>Stereotypes</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getMyReturnType <em>My Return Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getDeclaratives <em>Declaratives</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IPrimitiveOperationImpl#getItsActivityGraph <em>Its Activity Graph</em>}</li>
@@ -206,6 +207,26 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 	protected String name = NAME_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DISPLAY_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String displayName = DISPLAY_NAME_EDEFAULT;
+
+	/**
 	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -446,26 +467,6 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 	protected IDescription description;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The default value of the '{@link #getRequiremenTracabilityHandle() <em>Requiremen Tracability Handle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1580,6 +1581,8 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 				return getMyState();
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__NAME:
 				return getName();
+			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
+				return getDisplayName();
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__PROPERTIES:
 				if (resolve) return getProperties();
 				return basicGetProperties();
@@ -1621,8 +1624,6 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DESCRIPTION:
 				if (resolve) return getDescription();
 				return basicGetDescription();
-			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__REQUIREMEN_TRACABILITY_HANDLE:
 				return getRequiremenTracabilityHandle();
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DECLARATIVES:
@@ -1670,6 +1671,9 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__NAME:
 				setName((String)newValue);
 				return;
+			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
+				setDisplayName((String)newValue);
+				return;
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__PROPERTIES:
 				setProperties((IPropertyContainer)newValue);
 				return;
@@ -1724,9 +1728,6 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DESCRIPTION:
 				setDescription((IDescription)newValue);
 				return;
-			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__REQUIREMEN_TRACABILITY_HANDLE:
 				setRequiremenTracabilityHandle((String)newValue);
 				return;
@@ -1777,6 +1778,9 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
+			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
+				setDisplayName(DISPLAY_NAME_EDEFAULT);
+				return;
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__PROPERTIES:
 				setProperties((IPropertyContainer)null);
 				return;
@@ -1828,9 +1832,6 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DESCRIPTION:
 				setDescription((IDescription)null);
 				return;
-			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__REQUIREMEN_TRACABILITY_HANDLE:
 				setRequiremenTracabilityHandle(REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT);
 				return;
@@ -1873,6 +1874,8 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 				return MY_STATE_EDEFAULT == null ? myState != null : !MY_STATE_EDEFAULT.equals(myState);
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
+				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__PROPERTIES:
 				return properties != null;
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__LAST_ID:
@@ -1907,8 +1910,6 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 				return myReturnType != null;
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DESCRIPTION:
 				return description != null;
-			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__REQUIREMEN_TRACABILITY_HANDLE:
 				return REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT == null ? requiremenTracabilityHandle != null : !REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT.equals(requiremenTracabilityHandle);
 			case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DECLARATIVES:
@@ -1978,6 +1979,12 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelElement.class) {
+			switch (derivedFeatureID) {
+				case UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME: return UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME;
+				default: return -1;
+			}
+		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
@@ -2034,6 +2041,12 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelElement.class) {
+			switch (baseFeatureID) {
+				case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME: return UMLRhapsodyPackage.IPRIMITIVE_OPERATION__DISPLAY_NAME;
+				default: return -1;
+			}
+		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
@@ -2059,6 +2072,8 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 		result.append(myState);
 		result.append(", name: "); //$NON-NLS-1$
 		result.append(name);
+		result.append(", displayName: "); //$NON-NLS-1$
+		result.append(displayName);
 		result.append(", lastID: "); //$NON-NLS-1$
 		result.append(lastID);
 		result.append(", abstract: "); //$NON-NLS-1$
@@ -2073,8 +2088,6 @@ public class IPrimitiveOperationImpl extends OperationsTypeImpl implements IPrim
 		result.append(static_);
 		result.append(", constant: "); //$NON-NLS-1$
 		result.append(constant);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(", requiremenTracabilityHandle: "); //$NON-NLS-1$
 		result.append(requiremenTracabilityHandle);
 		result.append(", codeUpdateCGTime: "); //$NON-NLS-1$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IProfileImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IProfileImpl.java
index 5dbb21ba3ff..f939dae13c8 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IProfileImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IProfileImpl.java
@@ -59,7 +59,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IProfileImpl#getTypes <em>Types</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IProfileImpl#getMatrixLayouts <em>Matrix Layouts</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IProfileImpl#getLicense <em>License</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IProfileImpl#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -196,26 +195,6 @@ public class IProfileImpl extends IPackageImpl implements IProfile {
 	protected String license = LICENSE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -469,27 +448,6 @@ public class IProfileImpl extends IPackageImpl implements IProfile {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IPROFILE__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -539,8 +497,6 @@ public class IProfileImpl extends IPackageImpl implements IProfile {
 				return basicGetMatrixLayouts();
 			case UMLRhapsodyPackage.IPROFILE__LICENSE:
 				return getLicense();
-			case UMLRhapsodyPackage.IPROFILE__DISPLAY_NAME:
-				return getDisplayName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -594,9 +550,6 @@ public class IProfileImpl extends IPackageImpl implements IProfile {
 			case UMLRhapsodyPackage.IPROFILE__LICENSE:
 				setLicense((String)newValue);
 				return;
-			case UMLRhapsodyPackage.IPROFILE__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -642,9 +595,6 @@ public class IProfileImpl extends IPackageImpl implements IProfile {
 			case UMLRhapsodyPackage.IPROFILE__LICENSE:
 				setLicense(LICENSE_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.IPROFILE__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -679,8 +629,6 @@ public class IProfileImpl extends IPackageImpl implements IProfile {
 				return matrixLayouts != null;
 			case UMLRhapsodyPackage.IPROFILE__LICENSE:
 				return LICENSE_EDEFAULT == null ? license != null : !LICENSE_EDEFAULT.equals(license);
-			case UMLRhapsodyPackage.IPROFILE__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -769,8 +717,6 @@ public class IProfileImpl extends IPackageImpl implements IProfile {
 		result.append(configurationRelatedTime);
 		result.append(", license: "); //$NON-NLS-1$
 		result.append(license);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IRequirementImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IRequirementImpl.java
index 664db2dd53f..076d19fde83 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IRequirementImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IRequirementImpl.java
@@ -52,7 +52,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IRequirementImpl#getStereotypes <em>Stereotypes</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IRequirementImpl#getModifiedTimeWeak <em>Modified Time Weak</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IRequirementImpl#getReqID <em>Req ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IRequirementImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IRequirementImpl#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IRequirementImpl#getAnchors <em>Anchors</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IRequirementImpl#getHyperLinks <em>Hyper Links</em>}</li>
@@ -193,26 +192,6 @@ public class IRequirementImpl extends IAnnotationImpl implements IRequirement {
 	protected String reqID = REQ_ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The cached value of the '{@link #getDependencies() <em>Dependencies</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -443,27 +422,6 @@ public class IRequirementImpl extends IAnnotationImpl implements IRequirement {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.IREQUIREMENT__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EList<IDependency> getDependencies() {
 		if (dependencies == null) {
 			dependencies = new EObjectContainmentEList.Resolving<IDependency>(IDependency.class, this, UMLRhapsodyPackage.IREQUIREMENT__DEPENDENCIES);
@@ -578,8 +536,6 @@ public class IRequirementImpl extends IAnnotationImpl implements IRequirement {
 				return getModifiedTimeWeak();
 			case UMLRhapsodyPackage.IREQUIREMENT__REQ_ID:
 				return getReqID();
-			case UMLRhapsodyPackage.IREQUIREMENT__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.IREQUIREMENT__DEPENDENCIES:
 				return getDependencies();
 			case UMLRhapsodyPackage.IREQUIREMENT__ANCHORS:
@@ -628,9 +584,6 @@ public class IRequirementImpl extends IAnnotationImpl implements IRequirement {
 			case UMLRhapsodyPackage.IREQUIREMENT__REQ_ID:
 				setReqID((String)newValue);
 				return;
-			case UMLRhapsodyPackage.IREQUIREMENT__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.IREQUIREMENT__DEPENDENCIES:
 				getDependencies().clear();
 				getDependencies().addAll((Collection<? extends IDependency>)newValue);
@@ -682,9 +635,6 @@ public class IRequirementImpl extends IAnnotationImpl implements IRequirement {
 			case UMLRhapsodyPackage.IREQUIREMENT__REQ_ID:
 				setReqID(REQ_ID_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.IREQUIREMENT__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.IREQUIREMENT__DEPENDENCIES:
 				getDependencies().clear();
 				return;
@@ -725,8 +675,6 @@ public class IRequirementImpl extends IAnnotationImpl implements IRequirement {
 				return modifiedTimeWeak != null && !modifiedTimeWeak.isEmpty();
 			case UMLRhapsodyPackage.IREQUIREMENT__REQ_ID:
 				return REQ_ID_EDEFAULT == null ? reqID != null : !REQ_ID_EDEFAULT.equals(reqID);
-			case UMLRhapsodyPackage.IREQUIREMENT__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.IREQUIREMENT__DEPENDENCIES:
 				return dependencies != null && !dependencies.isEmpty();
 			case UMLRhapsodyPackage.IREQUIREMENT__ANCHORS:
@@ -761,8 +709,6 @@ public class IRequirementImpl extends IAnnotationImpl implements IRequirement {
 		result.append(modifiedTimeWeak);
 		result.append(", reqID: "); //$NON-NLS-1$
 		result.append(reqID);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IStateImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IStateImpl.java
index a2b0b40d9b5..4fde89ec932 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IStateImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IStateImpl.java
@@ -56,7 +56,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStateImpl#getExitAction <em>Exit Action</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStateImpl#getNestedStateChart <em>Nested State Chart</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStateImpl#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStateImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStateImpl#getAnnotations <em>Annotations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStateImpl#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStateImpl#getTheMainDiagram <em>The Main Diagram</em>}</li>
@@ -168,26 +167,6 @@ public class IStateImpl extends IStateVertexImpl implements IState {
 	protected String requiremenTracabilityHandle = REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The cached value of the '{@link #getAnnotations() <em>Annotations</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -615,27 +594,6 @@ public class IStateImpl extends IStateVertexImpl implements IState {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.ISTATE__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EList<IAnnotation> getAnnotations() {
 		if (annotations == null) {
 			annotations = new EObjectContainmentEList.Resolving<IAnnotation>(IAnnotation.class, this, UMLRhapsodyPackage.ISTATE__ANNOTATIONS);
@@ -849,8 +807,6 @@ public class IStateImpl extends IStateVertexImpl implements IState {
 				return basicGetNestedStateChart();
 			case UMLRhapsodyPackage.ISTATE__REQUIREMEN_TRACABILITY_HANDLE:
 				return getRequiremenTracabilityHandle();
-			case UMLRhapsodyPackage.ISTATE__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.ISTATE__ANNOTATIONS:
 				return getAnnotations();
 			case UMLRhapsodyPackage.ISTATE__DEPENDENCIES:
@@ -901,9 +857,6 @@ public class IStateImpl extends IStateVertexImpl implements IState {
 			case UMLRhapsodyPackage.ISTATE__REQUIREMEN_TRACABILITY_HANDLE:
 				setRequiremenTracabilityHandle((String)newValue);
 				return;
-			case UMLRhapsodyPackage.ISTATE__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.ISTATE__ANNOTATIONS:
 				getAnnotations().clear();
 				getAnnotations().addAll((Collection<? extends IAnnotation>)newValue);
@@ -957,9 +910,6 @@ public class IStateImpl extends IStateVertexImpl implements IState {
 			case UMLRhapsodyPackage.ISTATE__REQUIREMEN_TRACABILITY_HANDLE:
 				setRequiremenTracabilityHandle(REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.ISTATE__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.ISTATE__ANNOTATIONS:
 				getAnnotations().clear();
 				return;
@@ -1003,8 +953,6 @@ public class IStateImpl extends IStateVertexImpl implements IState {
 				return nestedStateChart != null;
 			case UMLRhapsodyPackage.ISTATE__REQUIREMEN_TRACABILITY_HANDLE:
 				return REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT == null ? requiremenTracabilityHandle != null : !REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT.equals(requiremenTracabilityHandle);
-			case UMLRhapsodyPackage.ISTATE__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.ISTATE__ANNOTATIONS:
 				return annotations != null && !annotations.isEmpty();
 			case UMLRhapsodyPackage.ISTATE__DEPENDENCIES:
@@ -1033,8 +981,6 @@ public class IStateImpl extends IStateVertexImpl implements IState {
 		result.append(stateType);
 		result.append(", requiremenTracabilityHandle: "); //$NON-NLS-1$
 		result.append(requiremenTracabilityHandle);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(", codeUpdateCGTime: "); //$NON-NLS-1$
 		result.append(codeUpdateCGTime);
 		result.append(')');
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IStereotypeImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IStereotypeImpl.java
index 18ee32fad12..48e1a85245c 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IStereotypeImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/IStereotypeImpl.java
@@ -64,7 +64,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ValueType;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStereotypeImpl#getInheritances <em>Inheritances</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStereotypeImpl#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStereotypeImpl#getRequiremenTracabilityHandle <em>Requiremen Tracability Handle</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStereotypeImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStereotypeImpl#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStereotypeImpl#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.IStereotypeImpl#getTheMainDiagram <em>The Main Diagram</em>}</li>
@@ -265,26 +264,6 @@ public class IStereotypeImpl extends IClassifierImpl implements IStereotype {
 	protected String requiremenTracabilityHandle = REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The default value of the '{@link #getObjectCreation() <em>Object Creation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -740,27 +719,6 @@ public class IStereotypeImpl extends IClassifierImpl implements IStereotype {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.ISTEREOTYPE__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public String getObjectCreation() {
 		return objectCreation;
 	}
@@ -963,8 +921,6 @@ public class IStereotypeImpl extends IClassifierImpl implements IStereotype {
 				return basicGetDependencies();
 			case UMLRhapsodyPackage.ISTEREOTYPE__REQUIREMEN_TRACABILITY_HANDLE:
 				return getRequiremenTracabilityHandle();
-			case UMLRhapsodyPackage.ISTEREOTYPE__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.ISTEREOTYPE__OBJECT_CREATION:
 				return getObjectCreation();
 			case UMLRhapsodyPackage.ISTEREOTYPE__UML_DEPENDENCY_ID:
@@ -1031,9 +987,6 @@ public class IStereotypeImpl extends IClassifierImpl implements IStereotype {
 			case UMLRhapsodyPackage.ISTEREOTYPE__REQUIREMEN_TRACABILITY_HANDLE:
 				setRequiremenTracabilityHandle((String)newValue);
 				return;
-			case UMLRhapsodyPackage.ISTEREOTYPE__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.ISTEREOTYPE__OBJECT_CREATION:
 				setObjectCreation((String)newValue);
 				return;
@@ -1097,9 +1050,6 @@ public class IStereotypeImpl extends IClassifierImpl implements IStereotype {
 			case UMLRhapsodyPackage.ISTEREOTYPE__REQUIREMEN_TRACABILITY_HANDLE:
 				setRequiremenTracabilityHandle(REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.ISTEREOTYPE__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.ISTEREOTYPE__OBJECT_CREATION:
 				setObjectCreation(OBJECT_CREATION_EDEFAULT);
 				return;
@@ -1150,8 +1100,6 @@ public class IStereotypeImpl extends IClassifierImpl implements IStereotype {
 				return dependencies != null;
 			case UMLRhapsodyPackage.ISTEREOTYPE__REQUIREMEN_TRACABILITY_HANDLE:
 				return REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT == null ? requiremenTracabilityHandle != null : !REQUIREMEN_TRACABILITY_HANDLE_EDEFAULT.equals(requiremenTracabilityHandle);
-			case UMLRhapsodyPackage.ISTEREOTYPE__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.ISTEREOTYPE__OBJECT_CREATION:
 				return OBJECT_CREATION_EDEFAULT == null ? objectCreation != null : !OBJECT_CREATION_EDEFAULT.equals(objectCreation);
 			case UMLRhapsodyPackage.ISTEREOTYPE__UML_DEPENDENCY_ID:
@@ -1268,8 +1216,6 @@ public class IStereotypeImpl extends IClassifierImpl implements IStereotype {
 		result.append(lastID);
 		result.append(", requiremenTracabilityHandle: "); //$NON-NLS-1$
 		result.append(requiremenTracabilityHandle);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(", objectCreation: "); //$NON-NLS-1$
 		result.append(objectCreation);
 		result.append(", umlDependencyID: "); //$NON-NLS-1$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ISubsystemImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ISubsystemImpl.java
index a2b3e74cb31..1e00d6233a2 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ISubsystemImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ISubsystemImpl.java
@@ -30,6 +30,8 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.DeclarativesType;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.DependsOnType;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ElementsType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.EmbededFilesType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.HyperLinksType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IClass;
@@ -44,9 +46,11 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IPropertyContain
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ISubsystem;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITag;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IUnit;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.M_pModelObjectType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.MatrixInstancesType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.OwnerHandleType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.TableInstancesType;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.TargetType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.TheMainDiagramType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UnknownType;
@@ -59,6 +63,7 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UnknownType;
  * The following features are implemented:
  * </p>
  * <ul>
+ *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISubsystemImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISubsystemImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISubsystemImpl#getMyState <em>My State</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISubsystemImpl#getName <em>Name</em>}</li>
@@ -95,13 +100,32 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UnknownType;
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISubsystemImpl#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISubsystemImpl#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISubsystemImpl#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISubsystemImpl#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 	/**
+	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DISPLAY_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String displayName = DISPLAY_NAME_EDEFAULT;
+
+	/**
 	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -562,26 +586,6 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 	protected String umlDependencyID = UML_DEPENDENCY_ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1465,6 +1469,8 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
+				return getDisplayName();
 			case UMLRhapsodyPackage.ISUBSYSTEM__ID:
 				return getId();
 			case UMLRhapsodyPackage.ISUBSYSTEM__MY_STATE:
@@ -1544,8 +1550,6 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 				return getObjectCreation();
 			case UMLRhapsodyPackage.ISUBSYSTEM__UML_DEPENDENCY_ID:
 				return getUmlDependencyID();
-			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
-				return getDisplayName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -1559,6 +1563,9 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
+				setDisplayName((String)newValue);
+				return;
 			case UMLRhapsodyPackage.ISUBSYSTEM__ID:
 				setId((String)newValue);
 				return;
@@ -1686,9 +1693,6 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 			case UMLRhapsodyPackage.ISUBSYSTEM__UML_DEPENDENCY_ID:
 				setUmlDependencyID((String)newValue);
 				return;
-			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -1701,6 +1705,9 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
+			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
+				setDisplayName(DISPLAY_NAME_EDEFAULT);
+				return;
 			case UMLRhapsodyPackage.ISUBSYSTEM__ID:
 				setId(ID_EDEFAULT);
 				return;
@@ -1809,9 +1816,6 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 			case UMLRhapsodyPackage.ISUBSYSTEM__UML_DEPENDENCY_ID:
 				setUmlDependencyID(UML_DEPENDENCY_ID_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -1824,6 +1828,8 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
+				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.ISUBSYSTEM__ID:
 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
 			case UMLRhapsodyPackage.ISUBSYSTEM__MY_STATE:
@@ -1896,8 +1902,6 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 				return OBJECT_CREATION_EDEFAULT == null ? objectCreation != null : !OBJECT_CREATION_EDEFAULT.equals(objectCreation);
 			case UMLRhapsodyPackage.ISUBSYSTEM__UML_DEPENDENCY_ID:
 				return UML_DEPENDENCY_ID_EDEFAULT == null ? umlDependencyID != null : !UML_DEPENDENCY_ID_EDEFAULT.equals(umlDependencyID);
-			case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -1908,11 +1912,95 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 	 * @generated
 	 */
 	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ElementsType.class) {
+			switch (derivedFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == DependsOnType.class) {
+			switch (derivedFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == DeclarativesType.class) {
+			switch (derivedFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == M_pModelObjectType.class) {
+			switch (derivedFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == TargetType.class) {
+			switch (derivedFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == IModelElement.class) {
+			switch (derivedFeatureID) {
+				case UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME: return UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME;
+				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 == ElementsType.class) {
+			switch (baseFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == DependsOnType.class) {
+			switch (baseFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == DeclarativesType.class) {
+			switch (baseFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == M_pModelObjectType.class) {
+			switch (baseFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == TargetType.class) {
+			switch (baseFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == IModelElement.class) {
+			switch (baseFeatureID) {
+				case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME: return UMLRhapsodyPackage.ISUBSYSTEM__DISPLAY_NAME;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: "); //$NON-NLS-1$
+		result.append(" (displayName: "); //$NON-NLS-1$
+		result.append(displayName);
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
 		result.append(", myState: "); //$NON-NLS-1$
 		result.append(myState);
@@ -1938,8 +2026,6 @@ public class ISubsystemImpl extends OwnerHandleTypeImpl implements ISubsystem {
 		result.append(objectCreation);
 		result.append(", umlDependencyID: "); //$NON-NLS-1$
 		result.append(umlDependencyID);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ISwimlaneImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ISwimlaneImpl.java
index a7a60ddcf1a..c7e88535bce 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ISwimlaneImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ISwimlaneImpl.java
@@ -51,7 +51,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISwimlaneImpl#getObjectCreation <em>Object Creation</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISwimlaneImpl#getUmlDependencyID <em>Uml Dependency ID</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISwimlaneImpl#getSwimlanes <em>Swimlanes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISwimlaneImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ISwimlaneImpl#getStereotypes <em>Stereotypes</em>}</li>
  * </ul>
  *
@@ -199,26 +198,6 @@ public class ISwimlaneImpl extends IModelElementImpl implements ISwimlane {
 	protected EList<ISwimlane> swimlanes;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * The cached value of the '{@link #getStereotypes() <em>Stereotypes</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -485,27 +464,6 @@ public class ISwimlaneImpl extends IModelElementImpl implements ISwimlane {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.ISWIMLANE__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public IStereotype getStereotypes() {
 		if (stereotypes != null && stereotypes.eIsProxy()) {
 			InternalEObject oldStereotypes = (InternalEObject)stereotypes;
@@ -583,8 +541,6 @@ public class ISwimlaneImpl extends IModelElementImpl implements ISwimlane {
 				return getUmlDependencyID();
 			case UMLRhapsodyPackage.ISWIMLANE__SWIMLANES:
 				return getSwimlanes();
-			case UMLRhapsodyPackage.ISWIMLANE__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.ISWIMLANE__STEREOTYPES:
 				if (resolve) return getStereotypes();
 				return basicGetStereotypes();
@@ -630,9 +586,6 @@ public class ISwimlaneImpl extends IModelElementImpl implements ISwimlane {
 				getSwimlanes().clear();
 				getSwimlanes().addAll((Collection<? extends ISwimlane>)newValue);
 				return;
-			case UMLRhapsodyPackage.ISWIMLANE__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.ISWIMLANE__STEREOTYPES:
 				setStereotypes((IStereotype)newValue);
 				return;
@@ -675,9 +628,6 @@ public class ISwimlaneImpl extends IModelElementImpl implements ISwimlane {
 			case UMLRhapsodyPackage.ISWIMLANE__SWIMLANES:
 				getSwimlanes().clear();
 				return;
-			case UMLRhapsodyPackage.ISWIMLANE__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.ISWIMLANE__STEREOTYPES:
 				setStereotypes((IStereotype)null);
 				return;
@@ -711,8 +661,6 @@ public class ISwimlaneImpl extends IModelElementImpl implements ISwimlane {
 				return UML_DEPENDENCY_ID_EDEFAULT == null ? umlDependencyID != null : !UML_DEPENDENCY_ID_EDEFAULT.equals(umlDependencyID);
 			case UMLRhapsodyPackage.ISWIMLANE__SWIMLANES:
 				return swimlanes != null && !swimlanes.isEmpty();
-			case UMLRhapsodyPackage.ISWIMLANE__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.ISWIMLANE__STEREOTYPES:
 				return stereotypes != null;
 		}
@@ -741,8 +689,6 @@ public class ISwimlaneImpl extends IModelElementImpl implements ISwimlane {
 		result.append(objectCreation);
 		result.append(", umlDependencyID: "); //$NON-NLS-1$
 		result.append(umlDependencyID);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITagImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITagImpl.java
index 6ea02e81f19..cb96bfcf713 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITagImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITagImpl.java
@@ -58,7 +58,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITagImpl#getMetaClass <em>Meta Class</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITagImpl#getDefaultValue <em>Default Value</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITagImpl#getCodeUpdateCGTime <em>Code Update CG Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITagImpl#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -265,26 +264,6 @@ public class ITagImpl extends IVariableImpl implements ITag {
 	protected EList<String> codeUpdateCGTime;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -744,27 +723,6 @@ public class ITagImpl extends IVariableImpl implements ITag {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.ITAG__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -821,8 +779,6 @@ public class ITagImpl extends IVariableImpl implements ITag {
 				return getDefaultValue();
 			case UMLRhapsodyPackage.ITAG__CODE_UPDATE_CG_TIME:
 				return getCodeUpdateCGTime();
-			case UMLRhapsodyPackage.ITAG__DISPLAY_NAME:
-				return getDisplayName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -881,9 +837,6 @@ public class ITagImpl extends IVariableImpl implements ITag {
 				getCodeUpdateCGTime().clear();
 				getCodeUpdateCGTime().addAll((Collection<? extends String>)newValue);
 				return;
-			case UMLRhapsodyPackage.ITAG__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -938,9 +891,6 @@ public class ITagImpl extends IVariableImpl implements ITag {
 			case UMLRhapsodyPackage.ITAG__CODE_UPDATE_CG_TIME:
 				getCodeUpdateCGTime().clear();
 				return;
-			case UMLRhapsodyPackage.ITAG__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -981,8 +931,6 @@ public class ITagImpl extends IVariableImpl implements ITag {
 				return DEFAULT_VALUE_EDEFAULT == null ? defaultValue != null : !DEFAULT_VALUE_EDEFAULT.equals(defaultValue);
 			case UMLRhapsodyPackage.ITAG__CODE_UPDATE_CG_TIME:
 				return codeUpdateCGTime != null && !codeUpdateCGTime.isEmpty();
-			case UMLRhapsodyPackage.ITAG__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -1013,8 +961,6 @@ public class ITagImpl extends IVariableImpl implements ITag {
 		result.append(defaultValue);
 		result.append(", codeUpdateCGTime: "); //$NON-NLS-1$
 		result.append(codeUpdateCGTime);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITransitionImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITransitionImpl.java
index b18d6827df9..34e594f501e 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITransitionImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITransitionImpl.java
@@ -64,7 +64,6 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITransitionImpl#getInheritsFromHandle <em>Inherits From Handle</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITransitionImpl#getDependencies <em>Dependencies</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITransitionImpl#getStereotypes <em>Stereotypes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITransitionImpl#getDisplayName <em>Display Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -301,26 +300,6 @@ public class ITransitionImpl extends IModelElementImpl implements ITransition {
 	protected IClassifier stereotypes;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -811,27 +790,6 @@ public class ITransitionImpl extends IModelElementImpl implements ITransition {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLRhapsodyPackage.ITRANSITION__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -891,8 +849,6 @@ public class ITransitionImpl extends IModelElementImpl implements ITransition {
 			case UMLRhapsodyPackage.ITRANSITION__STEREOTYPES:
 				if (resolve) return getStereotypes();
 				return basicGetStereotypes();
-			case UMLRhapsodyPackage.ITRANSITION__DISPLAY_NAME:
-				return getDisplayName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -957,9 +913,6 @@ public class ITransitionImpl extends IModelElementImpl implements ITransition {
 			case UMLRhapsodyPackage.ITRANSITION__STEREOTYPES:
 				setStereotypes((IClassifier)newValue);
 				return;
-			case UMLRhapsodyPackage.ITRANSITION__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -1020,9 +973,6 @@ public class ITransitionImpl extends IModelElementImpl implements ITransition {
 			case UMLRhapsodyPackage.ITRANSITION__STEREOTYPES:
 				setStereotypes((IClassifier)null);
 				return;
-			case UMLRhapsodyPackage.ITRANSITION__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -1067,8 +1017,6 @@ public class ITransitionImpl extends IModelElementImpl implements ITransition {
 				return dependencies != null && !dependencies.isEmpty();
 			case UMLRhapsodyPackage.ITRANSITION__STEREOTYPES:
 				return stereotypes != null;
-			case UMLRhapsodyPackage.ITRANSITION__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -1185,8 +1133,6 @@ public class ITransitionImpl extends IModelElementImpl implements ITransition {
 		result.append(objectCreation);
 		result.append(", name: "); //$NON-NLS-1$
 		result.append(name);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITriggeredImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITriggeredImpl.java
index 7a31288e6c0..942786babfe 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITriggeredImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/ITriggeredImpl.java
@@ -28,9 +28,12 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IModelElement;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ITriggered;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.IVariable;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.ItemsType;
+import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.M_pFormalMessageType;
 import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPackage;
 
 /**
@@ -41,9 +44,9 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  * The following features are implemented:
  * </p>
  * <ul>
+ *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITriggeredImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITriggeredImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITriggeredImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITriggeredImpl#getDisplayName <em>Display Name</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITriggeredImpl#getArgs <em>Args</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITriggeredImpl#getReturnType <em>Return Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.impl.ITriggeredImpl#getAbstract <em>Abstract</em>}</li>
@@ -58,64 +61,64 @@ import org.eclipse.papyrus.migration.rhapsody.rhapsodymetamodel.UMLRhapsodyPacka
  */
 public class ITriggeredImpl extends OperationsTypeImpl implements ITriggered {
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
+	 * @see #getDisplayName()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String ID_EDEFAULT = null;
+	protected static final String DISPLAY_NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
+	 * @see #getDisplayName()
 	 * @generated
 	 * @ordered
 	 */
-	protected String id = ID_EDEFAULT;
+	protected String displayName = DISPLAY_NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getId()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String NAME_EDEFAULT = null;
+	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getId()
 	 * @generated
 	 * @ordered
 	 */
-	protected String name = NAME_EDEFAULT;
+	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
+	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
+	protected String name = NAME_EDEFAULT;
 
 	/**
 	 * The cached value of the '{@link #getArgs() <em>Args</em>}' containment reference list.
@@ -518,12 +521,12 @@ public class ITriggeredImpl extends OperationsTypeImpl implements ITriggered {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
+				return getDisplayName();
 			case UMLRhapsodyPackage.ITRIGGERED__ID:
 				return getId();
 			case UMLRhapsodyPackage.ITRIGGERED__NAME:
 				return getName();
-			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
-				return getDisplayName();
 			case UMLRhapsodyPackage.ITRIGGERED__ARGS:
 				return getArgs();
 			case UMLRhapsodyPackage.ITRIGGERED__RETURN_TYPE:
@@ -554,15 +557,15 @@ public class ITriggeredImpl extends OperationsTypeImpl implements ITriggered {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
+				setDisplayName((String)newValue);
+				return;
 			case UMLRhapsodyPackage.ITRIGGERED__ID:
 				setId((String)newValue);
 				return;
 			case UMLRhapsodyPackage.ITRIGGERED__NAME:
 				setName((String)newValue);
 				return;
-			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
 			case UMLRhapsodyPackage.ITRIGGERED__ARGS:
 				getArgs().clear();
 				getArgs().addAll((Collection<? extends IVariable>)newValue);
@@ -601,15 +604,15 @@ public class ITriggeredImpl extends OperationsTypeImpl implements ITriggered {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
+			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
+				setDisplayName(DISPLAY_NAME_EDEFAULT);
+				return;
 			case UMLRhapsodyPackage.ITRIGGERED__ID:
 				setId(ID_EDEFAULT);
 				return;
 			case UMLRhapsodyPackage.ITRIGGERED__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
 			case UMLRhapsodyPackage.ITRIGGERED__ARGS:
 				getArgs().clear();
 				return;
@@ -646,12 +649,12 @@ public class ITriggeredImpl extends OperationsTypeImpl implements ITriggered {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
+				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.ITRIGGERED__ID:
 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
 			case UMLRhapsodyPackage.ITRIGGERED__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
 			case UMLRhapsodyPackage.ITRIGGERED__ARGS:
 				return args != null && !args.isEmpty();
 			case UMLRhapsodyPackage.ITRIGGERED__RETURN_TYPE:
@@ -678,16 +681,68 @@ public class ITriggeredImpl extends OperationsTypeImpl implements ITriggered {
 	 * @generated
 	 */
 	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == M_pFormalMessageType.class) {
+			switch (derivedFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == ItemsType.class) {
+			switch (derivedFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == IModelElement.class) {
+			switch (derivedFeatureID) {
+				case UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME: return UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME;
+				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 == M_pFormalMessageType.class) {
+			switch (baseFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == ItemsType.class) {
+			switch (baseFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == IModelElement.class) {
+			switch (baseFeatureID) {
+				case UMLRhapsodyPackage.IMODEL_ELEMENT__DISPLAY_NAME: return UMLRhapsodyPackage.ITRIGGERED__DISPLAY_NAME;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: "); //$NON-NLS-1$
+		result.append(" (displayName: "); //$NON-NLS-1$
+		result.append(displayName);
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
 		result.append(", name: "); //$NON-NLS-1$
 		result.append(name);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
 		result.append(", abstract: "); //$NON-NLS-1$
 		result.append(abstract_);
 		result.append(", final: "); //$NON-NLS-1$
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/UMLRhapsodyPackageImpl.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/UMLRhapsodyPackageImpl.java
index 79e73071420..94ddfeeef8a 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/UMLRhapsodyPackageImpl.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/UMLRhapsodyPackageImpl.java
@@ -8679,17 +8679,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIActivityGraph_DisplayName() {
-        return (EAttribute)getIActivityGraph().getEStructuralFeatures().get(20);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EReference getIActivityGraph_HyperLinks() {
-        return (EReference)getIActivityGraph().getEStructuralFeatures().get(21);
+        return (EReference)getIActivityGraph().getEStructuralFeatures().get(20);
 	}
 
 	/**
@@ -8698,7 +8689,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIActivityGraph_Dependencies() {
-        return (EReference)getIActivityGraph().getEStructuralFeatures().get(22);
+        return (EReference)getIActivityGraph().getEStructuralFeatures().get(21);
 	}
 
 	/**
@@ -8707,7 +8698,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIActivityGraph_TheMainDiagram() {
-        return (EReference)getIActivityGraph().getEStructuralFeatures().get(23);
+        return (EReference)getIActivityGraph().getEStructuralFeatures().get(22);
 	}
 
 	/**
@@ -8716,7 +8707,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIActivityGraph_Associations() {
-        return (EReference)getIActivityGraph().getEStructuralFeatures().get(24);
+        return (EReference)getIActivityGraph().getEStructuralFeatures().get(23);
 	}
 
 	/**
@@ -8725,7 +8716,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIActivityGraph_Tags() {
-        return (EReference)getIActivityGraph().getEStructuralFeatures().get(25);
+        return (EReference)getIActivityGraph().getEStructuralFeatures().get(24);
 	}
 
 	/**
@@ -10317,15 +10308,6 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIClass_DisplayName() {
-        return (EAttribute)getIClass().getEStructuralFeatures().get(34);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getIClassHandle() {
 		if (iClassHandleEClass == null) {
 			iClassHandleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(UMLRhapsodyPackage.eNS_URI).getEClassifiers().get(88);
@@ -10554,15 +10536,6 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIClassifierRole_DisplayName() {
-        return (EAttribute)getIClassifierRole().getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getICodeGenConfigInfo() {
 		if (iCodeGenConfigInfoEClass == null) {
 			iCodeGenConfigInfoEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(UMLRhapsodyPackage.eNS_URI).getEClassifiers().get(92);
@@ -12075,17 +12048,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIDependency_DisplayName() {
-        return (EAttribute)getIDependency().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EReference getIDependency_Dependencies() {
-        return (EReference)getIDependency().getEStructuralFeatures().get(10);
+        return (EReference)getIDependency().getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -12094,7 +12058,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIDependency_Description() {
-        return (EReference)getIDependency().getEStructuralFeatures().get(11);
+        return (EReference)getIDependency().getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -12103,7 +12067,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIDependency_RequiremenTracabilityHandle() {
-        return (EAttribute)getIDependency().getEStructuralFeatures().get(12);
+        return (EAttribute)getIDependency().getEStructuralFeatures().get(11);
 	}
 
 	/**
@@ -12112,7 +12076,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIDependency_CodeUpdateCGTime() {
-        return (EAttribute)getIDependency().getEStructuralFeatures().get(13);
+        return (EAttribute)getIDependency().getEStructuralFeatures().get(12);
 	}
 
 	/**
@@ -12375,17 +12339,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIDiagram_DisplayName() {
-        return (EAttribute)getIDiagram().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EAttribute getIDiagram_CodeUpdateCGTime() {
-        return (EAttribute)getIDiagram().getEStructuralFeatures().get(6);
+        return (EAttribute)getIDiagram().getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -12394,7 +12349,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIDiagram_HyperLinks() {
-        return (EReference)getIDiagram().getEStructuralFeatures().get(7);
+        return (EReference)getIDiagram().getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -12699,15 +12654,6 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIEvent_DisplayName() {
-        return (EAttribute)getIEvent().getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getIEventHandle() {
 		if (iEventHandleEClass == null) {
 			iEventHandleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(UMLRhapsodyPackage.eNS_URI).getEClassifiers().get(117);
@@ -14544,17 +14490,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIMHyperLink_DisplayName() {
-        return (EAttribute)getIMHyperLink().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EReference getIMHyperLink_Description() {
-        return (EReference)getIMHyperLink().getEStructuralFeatures().get(9);
+        return (EReference)getIMHyperLink().getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -14563,7 +14500,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMHyperLink_RequiremenTracabilityHandle() {
-        return (EAttribute)getIMHyperLink().getEStructuralFeatures().get(10);
+        return (EAttribute)getIMHyperLink().getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -14572,7 +14509,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMHyperLink_ObjectCreation() {
-        return (EAttribute)getIMHyperLink().getEStructuralFeatures().get(11);
+        return (EAttribute)getIMHyperLink().getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -14581,7 +14518,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMHyperLink_UmlDependencyID() {
-        return (EAttribute)getIMHyperLink().getEStructuralFeatures().get(12);
+        return (EAttribute)getIMHyperLink().getEStructuralFeatures().get(11);
 	}
 
 	/**
@@ -15009,17 +14946,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIMessage_DisplayName() {
-        return (EAttribute)getIMessage().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EAttribute getIMessage_M_szSequence() {
-        return (EAttribute)getIMessage().getEStructuralFeatures().get(4);
+        return (EAttribute)getIMessage().getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -15028,7 +14956,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMessage_M_szActualArgs() {
-        return (EAttribute)getIMessage().getEStructuralFeatures().get(5);
+        return (EAttribute)getIMessage().getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -15037,7 +14965,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMessage_M_szReturnVal() {
-        return (EAttribute)getIMessage().getEStructuralFeatures().get(6);
+        return (EAttribute)getIMessage().getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -15046,7 +14974,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIMessage_M_pReceiver() {
-        return (EReference)getIMessage().getEStructuralFeatures().get(7);
+        return (EReference)getIMessage().getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -15055,7 +14983,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIMessage_M_pSender() {
-        return (EReference)getIMessage().getEStructuralFeatures().get(8);
+        return (EReference)getIMessage().getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -15064,7 +14992,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIMessage_M_pFormalMessage() {
-        return (EReference)getIMessage().getEStructuralFeatures().get(9);
+        return (EReference)getIMessage().getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -15073,7 +15001,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMessage_M_eType() {
-        return (EAttribute)getIMessage().getEStructuralFeatures().get(10);
+        return (EAttribute)getIMessage().getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -15082,7 +15010,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIMessage_M_pCommunicationConnection() {
-        return (EReference)getIMessage().getEStructuralFeatures().get(11);
+        return (EReference)getIMessage().getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -15091,7 +15019,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMessage_M_freeText() {
-        return (EAttribute)getIMessage().getEStructuralFeatures().get(12);
+        return (EAttribute)getIMessage().getEStructuralFeatures().get(11);
 	}
 
 	/**
@@ -15100,7 +15028,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMessage_ModifiedTimeWeak() {
-        return (EAttribute)getIMessage().getEStructuralFeatures().get(13);
+        return (EAttribute)getIMessage().getEStructuralFeatures().get(12);
 	}
 
 	/**
@@ -15109,7 +15037,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIMessage_Stereotypes() {
-        return (EReference)getIMessage().getEStructuralFeatures().get(14);
+        return (EReference)getIMessage().getEStructuralFeatures().get(13);
 	}
 
 	/**
@@ -15118,7 +15046,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIMessage_Tags() {
-        return (EReference)getIMessage().getEStructuralFeatures().get(15);
+        return (EReference)getIMessage().getEStructuralFeatures().get(14);
 	}
 
 	/**
@@ -15127,7 +15055,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIMessage_Properties() {
-        return (EReference)getIMessage().getEStructuralFeatures().get(16);
+        return (EReference)getIMessage().getEStructuralFeatures().get(15);
 	}
 
 	/**
@@ -15136,7 +15064,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIMessage_M_targetExec() {
-        return (EReference)getIMessage().getEStructuralFeatures().get(17);
+        return (EReference)getIMessage().getEStructuralFeatures().get(16);
 	}
 
 	/**
@@ -15145,7 +15073,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIMessage_M_srcExec() {
-        return (EReference)getIMessage().getEStructuralFeatures().get(18);
+        return (EReference)getIMessage().getEStructuralFeatures().get(17);
 	}
 
 	/**
@@ -15154,7 +15082,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMessage_ObjectCreation() {
-        return (EAttribute)getIMessage().getEStructuralFeatures().get(19);
+        return (EAttribute)getIMessage().getEStructuralFeatures().get(18);
 	}
 
 	/**
@@ -15163,7 +15091,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIMessage_UmlDependencyID() {
-        return (EAttribute)getIMessage().getEStructuralFeatures().get(20);
+        return (EAttribute)getIMessage().getEStructuralFeatures().get(19);
 	}
 
 	/**
@@ -15261,6 +15189,15 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getIModelElement_DisplayName() {
+        return (EAttribute)getIModelElement().getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getIModule() {
 		if (iModuleEClass == null) {
 			iModuleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(UMLRhapsodyPackage.eNS_URI).getEClassifiers().get(158);
@@ -15852,17 +15789,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIPart_DisplayName() {
-        return (EAttribute)getIPart().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EAttribute getIPart_CodeUpdateCGTime() {
-        return (EAttribute)getIPart().getEStructuralFeatures().get(7);
+        return (EAttribute)getIPart().getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -15871,7 +15799,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIPart_TheMainDiagram() {
-        return (EReference)getIPart().getEStructuralFeatures().get(8);
+        return (EReference)getIPart().getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -15880,7 +15808,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIPart_Slots() {
-        return (EReference)getIPart().getEStructuralFeatures().get(9);
+        return (EReference)getIPart().getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -15889,7 +15817,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIPart_HyperLinks() {
-        return (EReference)getIPart().getEStructuralFeatures().get(10);
+        return (EReference)getIPart().getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -16203,17 +16131,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIPrimitiveOperation_DisplayName() {
-        return (EAttribute)getIPrimitiveOperation().getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EAttribute getIPrimitiveOperation_RequiremenTracabilityHandle() {
-        return (EAttribute)getIPrimitiveOperation().getEStructuralFeatures().get(18);
+        return (EAttribute)getIPrimitiveOperation().getEStructuralFeatures().get(17);
 	}
 
 	/**
@@ -16222,7 +16141,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIPrimitiveOperation_Declaratives() {
-        return (EReference)getIPrimitiveOperation().getEStructuralFeatures().get(19);
+        return (EReference)getIPrimitiveOperation().getEStructuralFeatures().get(18);
 	}
 
 	/**
@@ -16231,7 +16150,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIPrimitiveOperation_ItsActivityGraph() {
-        return (EReference)getIPrimitiveOperation().getEStructuralFeatures().get(20);
+        return (EReference)getIPrimitiveOperation().getEStructuralFeatures().get(19);
 	}
 
 	/**
@@ -16240,7 +16159,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIPrimitiveOperation_EmbededFiles() {
-        return (EReference)getIPrimitiveOperation().getEStructuralFeatures().get(21);
+        return (EReference)getIPrimitiveOperation().getEStructuralFeatures().get(20);
 	}
 
 	/**
@@ -16249,7 +16168,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIPrimitiveOperation_CodeUpdateCGTime() {
-        return (EAttribute)getIPrimitiveOperation().getEStructuralFeatures().get(22);
+        return (EAttribute)getIPrimitiveOperation().getEStructuralFeatures().get(21);
 	}
 
 	/**
@@ -16258,7 +16177,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIPrimitiveOperation_TemplateParameters() {
-        return (EReference)getIPrimitiveOperation().getEStructuralFeatures().get(23);
+        return (EReference)getIPrimitiveOperation().getEStructuralFeatures().get(22);
 	}
 
 	/**
@@ -16359,15 +16278,6 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIProfile_DisplayName() {
-        return (EAttribute)getIProfile().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getIProject() {
 		if (iProjectEClass == null) {
 			iProjectEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(UMLRhapsodyPackage.eNS_URI).getEClassifiers().get(173);
@@ -16989,17 +16899,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIRequirement_DisplayName() {
-        return (EAttribute)getIRequirement().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EReference getIRequirement_Dependencies() {
-        return (EReference)getIRequirement().getEStructuralFeatures().get(9);
+        return (EReference)getIRequirement().getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -17008,7 +16909,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIRequirement_Anchors() {
-        return (EReference)getIRequirement().getEStructuralFeatures().get(10);
+        return (EReference)getIRequirement().getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -17017,7 +16918,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIRequirement_HyperLinks() {
-        return (EReference)getIRequirement().getEStructuralFeatures().get(11);
+        return (EReference)getIRequirement().getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -17026,7 +16927,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIRequirement_TheMainDiagram() {
-        return (EReference)getIRequirement().getEStructuralFeatures().get(12);
+        return (EReference)getIRequirement().getEStructuralFeatures().get(11);
 	}
 
 	/**
@@ -17226,17 +17127,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIState_DisplayName() {
-        return (EAttribute)getIState().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EReference getIState_Annotations() {
-        return (EReference)getIState().getEStructuralFeatures().get(9);
+        return (EReference)getIState().getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -17245,7 +17137,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIState_Dependencies() {
-        return (EReference)getIState().getEStructuralFeatures().get(10);
+        return (EReference)getIState().getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -17254,7 +17146,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIState_TheMainDiagram() {
-        return (EReference)getIState().getEStructuralFeatures().get(11);
+        return (EReference)getIState().getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -17263,7 +17155,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIState_Swimlane() {
-        return (EReference)getIState().getEStructuralFeatures().get(12);
+        return (EReference)getIState().getEStructuralFeatures().get(11);
 	}
 
 	/**
@@ -17272,7 +17164,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIState_CodeUpdateCGTime() {
-        return (EAttribute)getIState().getEStructuralFeatures().get(13);
+        return (EAttribute)getIState().getEStructuralFeatures().get(12);
 	}
 
 	/**
@@ -17526,17 +17418,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getIStereotype_DisplayName() {
-        return (EAttribute)getIStereotype().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EAttribute getIStereotype_ObjectCreation() {
-        return (EAttribute)getIStereotype().getEStructuralFeatures().get(10);
+        return (EAttribute)getIStereotype().getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -17545,7 +17428,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getIStereotype_UmlDependencyID() {
-        return (EAttribute)getIStereotype().getEStructuralFeatures().get(11);
+        return (EAttribute)getIStereotype().getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -17554,7 +17437,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIStereotype_TheMainDiagram() {
-        return (EReference)getIStereotype().getEStructuralFeatures().get(12);
+        return (EReference)getIStereotype().getEStructuralFeatures().get(11);
 	}
 
 	/**
@@ -17563,7 +17446,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getIStereotype_Annotations() {
-        return (EReference)getIStereotype().getEStructuralFeatures().get(13);
+        return (EReference)getIStereotype().getEStructuralFeatures().get(12);
 	}
 
 	/**
@@ -17919,15 +17802,6 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getISubsystem_DisplayName() {
-        return (EAttribute)getISubsystem().getEStructuralFeatures().get(36);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getISwimlane() {
 		if (iSwimlaneEClass == null) {
 			iSwimlaneEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(UMLRhapsodyPackage.eNS_URI).getEClassifiers().get(192);
@@ -18021,17 +17895,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getISwimlane_DisplayName() {
-        return (EAttribute)getISwimlane().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EReference getISwimlane_Stereotypes() {
-        return (EReference)getISwimlane().getEStructuralFeatures().get(10);
+        return (EReference)getISwimlane().getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -18423,15 +18288,6 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getITag_DisplayName() {
-        return (EAttribute)getITag().getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getITemplateInst() {
 		if (iTemplateInstEClass == null) {
 			iTemplateInstEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(UMLRhapsodyPackage.eNS_URI).getEClassifiers().get(198);
@@ -18798,15 +18654,6 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getITransition_DisplayName() {
-        return (EAttribute)getITransition().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getITrigger() {
 		if (iTriggerEClass == null) {
 			iTriggerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(UMLRhapsodyPackage.eNS_URI).getEClassifiers().get(206);
@@ -18849,17 +18696,8 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getITriggered_DisplayName() {
-        return (EAttribute)getITriggered().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EReference getITriggered_Args() {
-        return (EReference)getITriggered().getEStructuralFeatures().get(3);
+        return (EReference)getITriggered().getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -18868,7 +18706,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EReference getITriggered_ReturnType() {
-        return (EReference)getITriggered().getEStructuralFeatures().get(4);
+        return (EReference)getITriggered().getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -18877,7 +18715,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getITriggered_Abstract() {
-        return (EAttribute)getITriggered().getEStructuralFeatures().get(5);
+        return (EAttribute)getITriggered().getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -18886,7 +18724,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getITriggered_Final() {
-        return (EAttribute)getITriggered().getEStructuralFeatures().get(6);
+        return (EAttribute)getITriggered().getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -18895,7 +18733,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getITriggered_Concurrency() {
-        return (EAttribute)getITriggered().getEStructuralFeatures().get(7);
+        return (EAttribute)getITriggered().getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -18904,7 +18742,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getITriggered_Protection() {
-        return (EAttribute)getITriggered().getEStructuralFeatures().get(8);
+        return (EAttribute)getITriggered().getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -18913,7 +18751,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getITriggered_ModifiedTimeWeak() {
-        return (EAttribute)getITriggered().getEStructuralFeatures().get(9);
+        return (EAttribute)getITriggered().getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -18922,7 +18760,7 @@ public class UMLRhapsodyPackageImpl extends EPackageImpl implements UMLRhapsodyP
 	 * @generated
 	 */
 	public EAttribute getITriggered_MyState() {
-        return (EAttribute)getITriggered().getEStructuralFeatures().get(10);
+        return (EAttribute)getITriggered().getEStructuralFeatures().get(9);
 	}
 
 	/**
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/rhapsodymetamodel.ecore b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/rhapsodymetamodel.ecore
index 7e93c870e83..79239942a7f 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/rhapsodymetamodel.ecore
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/impl/rhapsodymetamodel.ecore
@@ -1039,7 +1039,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m_bIsPreferencesInitialized"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HyperLinksType" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="HyperLinksType" abstract="true" eSuperTypes="#//IModelElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="IAcceptEventAction" eSuperTypes="#//IState #//ParentType #//ItsTargetType">
     <eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="#//IEvent"/>
   </eClassifiers>
@@ -1059,7 +1059,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IActivityGraph" eSuperTypes="#//NestedStateChartType #//DependsOnType #//ValueType #//TargetType #//M_pModelObjectType">
+  <eClassifiers xsi:type="ecore:EClass" name="IActivityGraph" eSuperTypes="#//NestedStateChartType #//DependsOnType #//ValueType #//TargetType #//M_pModelObjectType #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="weakCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -1091,7 +1091,6 @@
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectCreation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="HyperLinks" eType="#//IMHyperLink"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" upperBound="-1"
@@ -1351,7 +1350,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="cmheader" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IClassHandle" eSuperTypes="#//M_pBaseType">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m2Class" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -1383,7 +1381,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IStereotype"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectCreation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ICodeGenConfigInfo" eSuperTypes="#//DependsOnType">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -1619,7 +1616,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Tags" eType="#//ITag" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" eType="#//IComment"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" eType="#//IDependency"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="description" eType="#//IDescription"
@@ -1667,7 +1663,6 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" upperBound="-1"
         eType="#//IAnnotation" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="HyperLinks" upperBound="-1"
@@ -1720,7 +1715,6 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" eType="#//IConstraint"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IEventHandle">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m2Class" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -1983,7 +1977,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isConfigurationFileHyperLink"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkTarget" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="description" eType="#//IDescription"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiremenTracabilityHandle"
@@ -2056,7 +2049,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="myState" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m_szSequence" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m_szActualArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="m_szReturnVal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2087,7 +2079,9 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IModelElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IModelElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IModule" eSuperTypes="#//IInstance #//AssociationsType #//DependsOnType #//M_pModelObjectType #//End2_Type">
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IStereotype"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="description" eType="#//IDescription"
@@ -2162,7 +2156,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="cmheader" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IPanelDiagram" eSuperTypes="#//IDiagram #//DeclarativesType #//TargetType"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IPart" eSuperTypes="#//AssociationsType #//DependsOnType #//M_subjectType #//ValueType #//M_hTargetType #//M_pModelObjectType #//ToLinkType #//InverseType #//ConveyedType #//End2_Type #//TargetType #//FromLinkType #//End1_Type">
+  <eClassifiers xsi:type="ecore:EClass" name="IPart" eSuperTypes="#//AssociationsType #//DependsOnType #//M_subjectType #//ValueType #//M_hTargetType #//M_pModelObjectType #//ToLinkType #//InverseType #//ConveyedType #//End2_Type #//TargetType #//FromLinkType #//End1_Type #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IUnit"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="otherClass" eType="#//IUnit"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inverse" eType="#//InverseType"/>
@@ -2171,7 +2165,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Tags" eType="#//ITag" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="initialCallAction" eType="#//ICallAction"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="theMainDiagram" eType="#//DependsOnType"/>
@@ -2200,7 +2193,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" eType="#//IRequirement"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPrimitiveOperation" eSuperTypes="#//OperationsType #//DependsOnType #//M_subjectType #//ValueType #//M_pFormalMessageType #//ItemsType #//TargetType #//M_pModelObjectType">
+  <eClassifiers xsi:type="ecore:EClass" name="IPrimitiveOperation" eSuperTypes="#//OperationsType #//DependsOnType #//M_subjectType #//ValueType #//M_pFormalMessageType #//ItemsType #//TargetType #//M_pModelObjectType #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="properties" eType="#//IPropertyContainer"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2226,7 +2219,6 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="description" eType="#//IDescription"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiremenTracabilityHandle"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Declaratives" upperBound="-1"
@@ -2256,7 +2248,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="MatrixLayouts" eType="#//IMatrixLayout"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="license" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IProject" eSuperTypes="#//IPackage #//M_pModelObjectType">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="UserColors" unique="false"
@@ -2354,7 +2345,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="modifiedTimeWeak" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="reqID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" upperBound="-1"
         eType="#//IDependency" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Anchors" upperBound="-1"
@@ -2391,7 +2381,6 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiremenTracabilityHandle"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Annotations" upperBound="-1"
         eType="#//IAnnotation" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" eType="#//IDependency"
@@ -2442,7 +2431,6 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiremenTracabilityHandle"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectCreation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="theMainDiagram" eType="#//IUnit"/>
@@ -2450,7 +2438,7 @@
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IStructureDiagram" eSuperTypes="#//IDiagram #//DeclarativesType #//DependsOnType #//TargetType #//TheMainDiagramType #//M_pModelObjectType"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ISubsystem" eSuperTypes="#//OwnerHandleType #//DependsOnType #//DeclarativesType #//M_pModelObjectType #//TargetType #//DefaultSubsystemType">
+  <eClassifiers xsi:type="ecore:EClass" name="ISubsystem" eSuperTypes="#//OwnerHandleType #//DependsOnType #//DeclarativesType #//M_pModelObjectType #//TargetType #//DefaultSubsystemType #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="myState" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2510,7 +2498,6 @@
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectCreation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ISwimlane" eSuperTypes="#//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2525,7 +2512,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="umlDependencyID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Swimlanes" upperBound="-1"
         eType="#//ISwimlane" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IStereotype"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ISysMLPort" eSuperTypes="#//IInstance #//DependsOnType #//M_pFormalMessageType #//ToLinkType #//End2_Type #//FromLinkType #//End1_Type">
@@ -2587,7 +2573,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeUpdateCGTime" unique="false"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ITemplateInst">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -2636,13 +2621,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Dependencies" upperBound="-1"
         eType="#//IDependency" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Stereotypes" eType="#//IClassifier"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ITrigger" eSuperTypes="#//IModelElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ITriggered" eSuperTypes="#//OperationsType #//M_pFormalMessageType #//ItemsType">
+  <eClassifiers xsi:type="ecore:EClass" name="ITriggered" eSuperTypes="#//OperationsType #//M_pFormalMessageType #//ItemsType #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Args" upperBound="-1" eType="#//IVariable"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="#//IType"/>
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/util/UMLRhapsodySwitch.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/util/UMLRhapsodySwitch.java
index f3d16e7db32..58ca420c6b0 100644
--- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/util/UMLRhapsodySwitch.java
+++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody.metamodel/src-gen/org/eclipse/papyrus/migration/rhapsody/rhapsodymetamodel/util/UMLRhapsodySwitch.java
@@ -576,6 +576,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> {
 			case UMLRhapsodyPackage.HYPER_LINKS_TYPE: {
 				HyperLinksType hyperLinksType = (HyperLinksType)theEObject;
 				T result = caseHyperLinksType(hyperLinksType);
+				if (result == null) result = caseIModelElement(hyperLinksType);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -633,6 +634,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> {
 				if (result == null) result = caseValueType(iActivityGraph);
 				if (result == null) result = caseTargetType(iActivityGraph);
 				if (result == null) result = caseM_pModelObjectType(iActivityGraph);
+				if (result == null) result = caseIModelElement(iActivityGraph);
 				if (result == null) result = caseItsStateChartType(iActivityGraph);
 				if (result == null) result = caseElementsType(iActivityGraph);
 				if (result == null) result = defaultCase(theEObject);
@@ -1102,6 +1104,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> {
 				IExternalHyperlink iExternalHyperlink = (IExternalHyperlink)theEObject;
 				T result = caseIExternalHyperlink(iExternalHyperlink);
 				if (result == null) result = caseHyperLinksType(iExternalHyperlink);
+				if (result == null) result = caseIModelElement(iExternalHyperlink);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -1288,6 +1291,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> {
 				IInternalHyperlink iInternalHyperlink = (IInternalHyperlink)theEObject;
 				T result = caseIInternalHyperlink(iInternalHyperlink);
 				if (result == null) result = caseHyperLinksType(iInternalHyperlink);
+				if (result == null) result = caseIModelElement(iInternalHyperlink);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -1328,6 +1332,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> {
 				IMHyperLink imHyperLink = (IMHyperLink)theEObject;
 				T result = caseIMHyperLink(imHyperLink);
 				if (result == null) result = caseHyperLinksType(imHyperLink);
+				if (result == null) result = caseIModelElement(imHyperLink);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -1521,6 +1526,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> {
 				if (result == null) result = caseConveyedType(iPart);
 				if (result == null) result = caseEnd2_Type(iPart);
 				if (result == null) result = caseTargetType(iPart);
+				if (result == null) result = caseIModelElement(iPart);
 				if (result == null) result = caseInverseType(iPart);
 				if (result == null) result = caseElementsType(iPart);
 				if (result == null) result = caseFromLinkType(iPart);
@@ -1565,6 +1571,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> {
 				if (result == null) result = caseItemsType(iPrimitiveOperation);
 				if (result == null) result = caseTargetType(iPrimitiveOperation);
 				if (result == null) result = caseM_pModelObjectType(iPrimitiveOperation);
+				if (result == null) result = caseIModelElement(iPrimitiveOperation);
 				if (result == null) result = caseElementsType(iPrimitiveOperation);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -1780,6 +1787,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> {
 				if (result == null) result = caseDeclarativesType(iSubsystem);
 				if (result == null) result = caseM_pModelObjectType(iSubsystem);
 				if (result == null) result = caseTargetType(iSubsystem);
+				if (result == null) result = caseIModelElement(iSubsystem);
 				if (result == null) result = caseDefaultSubsystemType(iSubsystem);
 				if (result == null) result = caseElementsType(iSubsystem);
 				if (result == null) result = defaultCase(theEObject);
@@ -1918,6 +1926,7 @@ public class UMLRhapsodySwitch<T> extends Switch<T> {
 				if (result == null) result = caseOperationsType(iTriggered);
 				if (result == null) result = caseM_pFormalMessageType(iTriggered);
 				if (result == null) result = caseItemsType(iTriggered);
+				if (result == null) result = caseIModelElement(iTriggered);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
author	Vincent Lorenzo	2016-12-12 14:47:01 +0000
committer	vincent lorenzo	2016-12-13 09:14:45 +0000
commit	1db6463733535d760b4282468648f6ef3e3d721a (patch)
tree	5dbf33330d7f82d50324f44c048685f890bfb648 /extraplugins
parent	15ff1578395d0d476453e80ca0082ccda46bb8da (diff)
download	org.eclipse.papyrus-1db6463733535d760b4282468648f6ef3e3d721a.tar.gz org.eclipse.papyrus-1db6463733535d760b4282468648f6ef3e3d721a.tar.xz org.eclipse.papyrus-1db6463733535d760b4282468648f6ef3e3d721a.zip