Bug 487442 - Add profile/stereotype support to the

elementtypeconfiguration framework

Change-Id: I40493e2b70490fc2a534b5d45bd848ab8957c1cc

180 files changed, 1843 insertions, 727 deletions

diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
index a67968e4113..f44d4b94a43 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.11.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",

  org.eclipse.uml2.uml;bundle-version="5.1.0",

  org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",

  org.eclipse.xtend.lib;bundle-version="2.8.0",

diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
index 17992548c56..ea849478806 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.11.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",

  org.eclipse.uml2.uml;bundle-version="5.1.0",

  org.eclipse.xtend.lib;bundle-version="2.8.0",

  org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",

diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/META-INF/MANIFEST.MF
index ea59b7e908d..aac3cd65f54 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.11.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",

  org.eclipse.uml2.uml;bundle-version="5.1.0",

  org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",

  org.eclipse.xtend.lib;bundle-version="2.8.0",

diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/META-INF/MANIFEST.MF
index 044dfae5647..a24bfd9e006 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.11.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations;bundle-version="1.2.0",

  org.eclipse.uml2.uml;bundle-version="5.1.0",

  org.eclipse.xtend.lib;bundle-version="2.8.0",

  org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

  com.google.inject;bundle-version="3.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0"

 Export-Package: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator,

  org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.internal;x-internal:=true

 Bundle-Vendor: %providerName

diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ApplyStereotypeAdviceRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ApplyStereotypeAdviceRule.xtend
index 37dd11a76b7..486d8ac81ab 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ApplyStereotypeAdviceRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ApplyStereotypeAdviceRule.xtend
@@ -15,8 +15,8 @@ package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator
 import javax.inject.Inject
 import javax.inject.Singleton
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory
 import org.eclipse.uml2.uml.Stereotype
 
 /**
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ElementTypeRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ElementTypeRule.xtend
index 85b97fbfce8..99878ba8f53 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ElementTypeRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ElementTypeRule.xtend
@@ -18,7 +18,7 @@ import org.eclipse.core.resources.ResourcesPlugin
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory
 import org.eclipse.uml2.uml.Stereotype
 
 import static extension org.eclipse.emf.common.util.URI.decode
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/.classpath b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.classpath
index afb9bb46ef3..afb9bb46ef3 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/.classpath
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.classpath
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/.project b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.project
index 9b9367361fd..6c8ce5340e5 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.uml.tools.elementtypesconfigurations</name>

+	<name>org.eclipse.papyrus.uml.elementtypesconfigurations</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..4759947300a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/.settings/org.eclipse.jdt.ui.prefs b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..fe048039d8b
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/META-INF/MANIFEST.MF
@@ -0,0 +1,52 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.emf.ecore;visibility:=reexport,

+ org.eclipse.emf.ecore.xmi;visibility:=reexport,

+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0";visibility:=reexport,

+ org.eclipse.uml2.types;visibility:=reexport,

+ org.eclipse.uml2.uml;visibility:=reexport,

+ org.eclipse.emf.edit;visibility:=reexport,

+ org.eclipse.emf.ecore.edit;visibility:=reexport,

+ org.eclipse.papyrus.infra.elementtypesconfigurations.edit;bundle-version="1.2.0";visibility:=reexport,

+ org.eclipse.uml2.uml.edit;visibility:=reexport,

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

+ org.eclipse.swt,

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes;bundle-version="1.2.0";visibility:=reexport,

+ org.eclipse.ui.workbench,

+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0"

+Export-Package: org.eclipse.papyrus.uml.elementtypesconfigurations,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.edithelper,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.util,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider,

+ org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider.StereotypeApplicationMatcherConfigurationEditPlugin$Implementation

+Bundle-SymbolicName: org.eclipse.papyrus.uml.elementtypesconfigurations;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/about.html b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/about.html
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/about.html
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/build.properties b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/build.properties
index 2a428ee4b1e..2a428ee4b1e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/build.properties
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/Stereotype.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/Stereotype.gif
index b7ae8706f73..b7ae8706f73 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/Stereotype.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/Stereotype.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
index fcfec345ba6..fcfec345ba6 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
index 91bb42f1a6b..91bb42f1a6b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
index 95a741cb08d..95a741cb08d 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeActionConfiguration_stereotypesToApply_StereotypeToApply.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeActionConfiguration_stereotypesToApply_StereotypeToApply.gif
index fe10b8e7be4..fe10b8e7be4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeActionConfiguration_stereotypesToApply_StereotypeToApply.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeActionConfiguration_stereotypesToApply_StereotypeToApply.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeAdviceConfiguration_stereotypesToApply_StereotypeToApply.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeAdviceConfiguration_stereotypesToApply_StereotypeToApply.gif
index 72cfbd01f7f..72cfbd01f7f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeAdviceConfiguration_stereotypesToApply_StereotypeToApply.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeAdviceConfiguration_stereotypesToApply_StereotypeToApply.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeConfiguration.gif
index d8b262a3bb1..d8b262a3bb1 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif
index 95a524524a9..95a524524a9 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
index dac4138ca01..dac4138ca01 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
index 755e4ca7a46..755e4ca7a46 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
index 8ce82e3f6c7..8ce82e3f6c7 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
index fe708946d58..fe708946d58 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
index 4aaad5a4cd7..4aaad5a4cd7 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
index 44afafd55da..44afafd55da 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
index f93c92d061a..f93c92d061a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
index 5ef9a94e8da..5ef9a94e8da 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
index bbf242da6a9..bbf242da6a9 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
index f08356ef9bb..f08356ef9bb 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
index 37dad615792..37dad615792 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
index 8ce82e3f6c7..8ce82e3f6c7 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
index 4aaad5a4cd7..4aaad5a4cd7 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
index 33e07420851..33e07420851 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
index e180c4cf7ca..e180c4cf7ca 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
index f58e5a1f04f..f58e5a1f04f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypedElementMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypedElementMatcherConfiguration.gif
index ff53277ff1c..ff53277ff1c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypedElementMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypedElementMatcherConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeActionConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeActionConfiguration.gif
index 62e68eb5614..62e68eb5614 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeActionConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeActionConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeAdviceConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeAdviceConfiguration.gif
index 7b489fdd24d..7b489fdd24d 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeAdviceConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeAdviceConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeActionConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeActionConfiguration.gif
index 15cbbadd0dc..15cbbadd0dc 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeActionConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeActionConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeAdviceConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeAdviceConfiguration.gif
index 1b149e889ab..1b149e889ab 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeAdviceConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeAdviceConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
index 03366e35d0f..03366e35d0f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
index 8997497557c..8997497557c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
index c048169804a..c048169804a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeConfiguration.gif
index a573a9e5f29..a573a9e5f29 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
index 09b8804bd23..09b8804bd23 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
index e8daccd8af2..e8daccd8af2 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantStereotypeRuleConfiguration.gif
index 0a4d20c16db..0a4d20c16db 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
index fcfec345ba6..fcfec345ba6 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
index d8d5fa98a50..d8d5fa98a50 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateStereotypeToApply_featuresToSet_FeatureToSet.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateStereotypeToApply_featuresToSet_FeatureToSet.gif
index c561177716e..c561177716e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/ctool16/CreateStereotypeToApply_featuresToSet_FeatureToSet.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateStereotypeToApply_featuresToSet_FeatureToSet.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeActionConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeActionConfiguration.gif
index 35ef84e20e2..35ef84e20e2 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeActionConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeActionConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeAdviceConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeAdviceConfiguration.gif
index 14af8aaee9f..14af8aaee9f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeAdviceConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeAdviceConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/ConstantValue.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ConstantValue.gif
index e4bc22dd17e..e4bc22dd17e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/ConstantValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ConstantValue.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/FeatureToSet.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/FeatureToSet.gif
index 5a9bc7514fa..5a9bc7514fa 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/FeatureToSet.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/FeatureToSet.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeConfiguration.gif
index c4a8af41844..c4a8af41844 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeRuleConfiguration.gif
index 33854e98c25..33854e98c25 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/ListValue.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ListValue.gif
index c3370c7ddd5..c3370c7ddd5 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/ListValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ListValue.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/QueryExecutionValue.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/QueryExecutionValue.gif
index ed874747401..ed874747401 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/QueryExecutionValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/QueryExecutionValue.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/SetTypeActionConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/SetTypeActionConfiguration.gif
index be22463d291..be22463d291 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/SetTypeActionConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/SetTypeActionConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/SetTypeAdviceConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/SetTypeAdviceConfiguration.gif
index ea58a657dc0..ea58a657dc0 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/SetTypeAdviceConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/SetTypeAdviceConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypeApplicationMatcherConfiguration.gif
index 904159880b3..904159880b3 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/StereotypeToApply.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypeToApply.gif
index caf2804510d..caf2804510d 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/StereotypeToApply.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypeToApply.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/StereotypedElementMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypedElementMatcherConfiguration.gif
index d3dc5a9ad81..d3dc5a9ad81 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/icons/full/obj16/StereotypedElementMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypedElementMatcherConfiguration.gif
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.ecore b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.ecore
index 5b1d1546bbd..5b1d1546bbd 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.ecore
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.ecore
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.genmodel b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.genmodel
index ddb1920b821..1c36da6f3f0 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.genmodel
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.genmodel
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen"

-    editDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen"

-    editorDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.uml.tools.elementtypesconfigurations" modelName="ApplyStereotypeAdviceConfiguration"

-    modelPluginClass="" testsDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations.tests/src-gen"

+    modelDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"

+    editDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"

+    editorDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.editor/src-gen"

+    modelPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" modelName="ApplyStereotypeAdviceConfiguration"

+    modelPluginClass="" testsDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.tests/src-gen"

     importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

     usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">

   <foreignModel>ApplyStereotypeAdviceConfiguration.ecore</foreignModel>

-  <genPackages prefix="ApplyStereotypeAdviceConfiguration" basePackage="org.eclipse.papyrus.uml.tools.elementtypesconfigurations"

+  <genPackages prefix="ApplyStereotypeAdviceConfiguration" basePackage="org.eclipse.papyrus.uml.elementtypesconfigurations"

       resource="XML" disposableProviderFactory="true" childCreationExtenders="true"

       ecorePackage="ApplyStereotypeAdviceConfiguration.ecore#/">

     <genClasses ecoreClass="ApplyStereotypeAdviceConfiguration.ecore#//ApplyStereotypeAdviceConfiguration">

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.ecore b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.ecore
index 26f9c011fd2..26f9c011fd2 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.ecore
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.ecore
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.genmodel b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.genmodel
index a5101ec6e39..8d7327c1cb3 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.genmodel
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.genmodel
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen"

-    editDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen"

-    editorDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.uml.tools.elementtypesconfigurations" modelName="InvariantStereotypeRuleConfiguration"

+    modelDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"

+    editDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"

+    editorDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.editor/src-gen"

+    modelPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" modelName="InvariantStereotypeRuleConfiguration"

     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"

-    testsDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations.tests/src-gen"

+    testsDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.tests/src-gen"

     importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

-    editPluginID="org.eclipse.papyrus.uml.tools.elementtypesconfigurations" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel#//invarianttypeconfiguration"

+    editPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel#//invarianttypeconfiguration"

     operationReflection="true" importOrganizing="true">

   <foreignModel>InvariantStereotypeRuleConfiguration.ecore</foreignModel>

-  <genPackages prefix="InvariantStereotypeRuleConfiguration" basePackage="org.eclipse.papyrus.uml.tools.elementtypesconfigurations"

+  <genPackages prefix="InvariantStereotypeRuleConfiguration" basePackage="org.eclipse.papyrus.uml.elementtypesconfigurations"

       resource="XML" disposableProviderFactory="true" childCreationExtenders="true"

       ecorePackage="InvariantStereotypeRuleConfiguration.ecore#/">

     <genClasses ecoreClass="InvariantStereotypeRuleConfiguration.ecore#//InvariantStereotypeRuleConfiguration">

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/SetTypeAdviceConfiguration.ecore b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/SetTypeAdviceConfiguration.ecore
index 9d60c43f908..9d60c43f908 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/SetTypeAdviceConfiguration.ecore
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/SetTypeAdviceConfiguration.ecore
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/SetTypeAdviceConfiguration.genmodel b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/SetTypeAdviceConfiguration.genmodel
index 20d37e4a7d1..43eafc7ee84 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/SetTypeAdviceConfiguration.genmodel
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/SetTypeAdviceConfiguration.genmodel
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen"

-    editDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen"

-    editorDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.uml.tools.elementtypesconfigurations" modelName="SetTypeAdviceConfiguration"

+    modelDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"

+    editDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"

+    editorDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.editor/src-gen"

+    modelPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" modelName="SetTypeAdviceConfiguration"

     modelPluginClass="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    testsDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations.tests/src-gen"

+    testsDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.tests/src-gen"

     importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

     usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations"

     operationReflection="true" importOrganizing="true">

   <foreignModel>SetTypeAdviceConfiguration.ecore</foreignModel>

-  <genPackages prefix="SetTypeAdviceConfiguration" basePackage="org.eclipse.papyrus.uml.tools.elementtypesconfigurations"

+  <genPackages prefix="SetTypeAdviceConfiguration" basePackage="org.eclipse.papyrus.uml.elementtypesconfigurations"

       disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="SetTypeAdviceConfiguration.ecore#/">

     <genClasses ecoreClass="SetTypeAdviceConfiguration.ecore#//SetTypeAdviceConfiguration">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetTypeAdviceConfiguration.ecore#//SetTypeAdviceConfiguration/validTypes"/>

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.ecore b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.ecore
index 7ed203c463a..7ed203c463a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.ecore
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.ecore
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.genmodel b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.genmodel
index 4fd8dd74b23..816a74b53a8 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.genmodel
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.genmodel
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen"
-    editDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen"
-    editorDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.uml.tools.elementtypesconfigurations" modelName="StereotypeApplicationMatcherConfiguration"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.uml.tools.elementtypesconfigurations.tests/src-gen"
+    modelDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
+    editDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
+    editorDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" modelName="StereotypeApplicationMatcherConfiguration"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.tests/src-gen"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
     usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations"
     operationReflection="true" importOrganizing="true">
   <foreignModel>StereotypeApplicationMatcherConfiguration.ecore</foreignModel>
-  <genPackages prefix="StereotypeApplicationMatcherConfiguration" basePackage="org.eclipse.papyrus.uml.tools.elementtypesconfigurations"
+  <genPackages prefix="StereotypeApplicationMatcherConfiguration" basePackage="org.eclipse.papyrus.uml.elementtypesconfigurations"
       resource="XML" disposableProviderFactory="true" childCreationExtenders="true"
       ecorePackage="StereotypeApplicationMatcherConfiguration.ecore#/">
     <genClasses ecoreClass="StereotypeApplicationMatcherConfiguration.ecore#//StereotypeApplicationMatcherConfiguration">
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/plugin.properties
index 46ac51d3ac3..46ac51d3ac3 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/plugin.properties
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/plugin.xml
index aab76f319ea..c2d69d2e2ad 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/plugin.xml
@@ -10,11 +10,39 @@
 

 <plugin>

 
+   <extension

+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invariantRule">

+      <invariantRule

+            configurationClass="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration"

+            invariantRuleClass="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRule">

+      </invariantRule>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">

+      <adviceConfigurationType

+            configurationClass="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration"

+            factoryClass="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceFactory">

+      </adviceConfigurationType>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">

+      <adviceConfigurationType

+            configurationClass="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration"

+            factoryClass="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceFactory">

+      </adviceConfigurationType>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.matcherConfigurationType">

+      <matcherConfigurationType

+            configurationClass="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration"

+            factoryClass="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherFactory">

+      </matcherConfigurationType>

+   </extension>

    <extension point="org.eclipse.emf.ecore.generated_package">

       <!-- @generated ApplyStereotypeAdviceConfiguration -->

       <package

             uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage"

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage"

             genModel="model/ApplyStereotypeAdviceConfiguration.genmodel"/>

    </extension>

 

@@ -22,14 +50,14 @@
       <!-- @generated ApplyStereotypeAdviceConfiguration -->

       <parser

             type="applystereotypeadviceconfiguration"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationResourceFactoryImpl"/>

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationResourceFactoryImpl"/>

    </extension>

 

    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

       <!-- @generated ApplyStereotypeAdviceConfiguration -->

       <factory

             uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider.ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory"

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider.ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory"

             supportedTypes=

               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

                org.eclipse.emf.edit.provider.IStructuredItemContentProvider

@@ -42,13 +70,13 @@
       <!-- @generated ApplyStereotypeAdviceConfiguration -->

       <extender

             uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider.ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider.ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>

    </extension>

    <extension point="org.eclipse.emf.ecore.generated_package">

       <!-- @generated InvariantStereotypeRuleConfiguration -->

       <package

             uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage"

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage"

             genModel="model/InvariantStereotypeRuleConfiguration.genmodel"/>

    </extension>

 

@@ -56,14 +84,14 @@
       <!-- @generated InvariantStereotypeRuleConfiguration -->

       <parser

             type="invariantstereotyperuleconfiguration"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationResourceFactoryImpl"/>

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationResourceFactoryImpl"/>

    </extension>

 

    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

       <!-- @generated InvariantStereotypeRuleConfiguration -->

       <factory

             uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider.InvariantStereotypeRuleConfigurationItemProviderAdapterFactory"

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider.InvariantStereotypeRuleConfigurationItemProviderAdapterFactory"

             supportedTypes=

               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

                org.eclipse.emf.edit.provider.IStructuredItemContentProvider

@@ -75,14 +103,14 @@
    <extension point="org.eclipse.emf.edit.childCreationExtenders">

       <!-- @generated InvariantStereotypeRuleConfiguration -->

       <extender

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.0"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider.InvariantStereotypeRuleConfigurationItemProviderAdapterFactory$InvariantTypeConfigurationChildCreationExtender"/>

+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider.InvariantStereotypeRuleConfigurationItemProviderAdapterFactory$InvariantTypeConfigurationChildCreationExtender"/>

    </extension>

    <extension point="org.eclipse.emf.ecore.generated_package">

       <!-- @generated SetTypeAdviceConfiguration -->

       <package

             uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/settypeadvice/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage"

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage"

             genModel="model/SetTypeAdviceConfiguration.genmodel"/>

    </extension>

 

@@ -90,7 +118,7 @@
       <!-- @generated SetTypeAdviceConfiguration -->

       <factory

             uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/settypeadvice/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.provider.SetTypeAdviceConfigurationItemProviderAdapterFactory"

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider.SetTypeAdviceConfigurationItemProviderAdapterFactory"

             supportedTypes=

               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

                org.eclipse.emf.edit.provider.IStructuredItemContentProvider

@@ -103,13 +131,13 @@
       <!-- @generated SetTypeAdviceConfiguration -->

       <extender

             uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.provider.SetTypeAdviceConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider.SetTypeAdviceConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>

    </extension>

    <extension point="org.eclipse.emf.ecore.generated_package">

       <!-- @generated StereotypeApplicationMatcherConfiguration -->

       <package

             uri="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage"

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage"

             genModel="model/StereotypeApplicationMatcherConfiguration.genmodel"/>

    </extension>

 

@@ -117,14 +145,14 @@
       <!-- @generated StereotypeApplicationMatcherConfiguration -->

       <parser

             type="stereotypeapplicationmatcherconfiguration"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationResourceFactoryImpl"/>

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationResourceFactoryImpl"/>

    </extension>

 

    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

       <!-- @generated StereotypeApplicationMatcherConfiguration -->

       <factory

             uri="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider.StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory"

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider.StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory"

             supportedTypes=

               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

                org.eclipse.emf.edit.provider.IStructuredItemContentProvider

@@ -137,34 +165,6 @@
       <!-- @generated StereotypeApplicationMatcherConfiguration -->

       <extender

             uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

-            class="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider.StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invariantRule">

-      <invariantRule

-            configurationClass="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration"

-            invariantRuleClass="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRule">

-      </invariantRule>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">

-      <adviceConfigurationType

-            configurationClass="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration"

-            factoryClass="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceFactory">

-      </adviceConfigurationType>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">

-      <adviceConfigurationType

-            configurationClass="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration"

-            factoryClass="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceFactory">

-      </adviceConfigurationType>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.matcherConfigurationType">

-      <matcherConfigurationType

-            configurationClass="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration"

-            factoryClass="org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherFactory">

-      </matcherConfigurationType>

+            class="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider.StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>

    </extension>

 </plugin>

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/pom.xml
index e5c0735b0b2..d9a0269604f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/pom.xml
@@ -5,9 +5,9 @@
 		<artifactId>org.eclipse.papyrus.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<relativePath>../../../releng/main</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.uml.tools.elementtypesconfigurations</artifactId>
+	<artifactId>org.eclipse.papyrus.uml.elementtypesconfigurations</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfiguration.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfiguration.java
index 4704ec5d2ee..1e0778f89dd 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfiguration.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -25,17 +25,17 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindin
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getApplyStereotypeAdviceConfiguration()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getApplyStereotypeAdviceConfiguration()
  * @model
  * @generated
  */
 public interface ApplyStereotypeAdviceConfiguration extends AbstractAdviceBindingConfiguration {
 	/**
 	 * Returns the value of the '<em><b>Stereotypes To Apply</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply}.
+	 * The list contents are of type {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Stereotypes To Apply</em>' containment reference list isn't clear,
@@ -43,7 +43,7 @@ public interface ApplyStereotypeAdviceConfiguration extends AbstractAdviceBindin
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotypes To Apply</em>' containment reference list.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getApplyStereotypeAdviceConfiguration_StereotypesToApply()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getApplyStereotypeAdviceConfiguration_StereotypesToApply()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationFactory.java
index 35226e7e160..97998b1fb39 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage
  * @generated
  */
 public interface ApplyStereotypeAdviceConfigurationFactory extends EFactory {
@@ -29,7 +29,7 @@ public interface ApplyStereotypeAdviceConfigurationFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	ApplyStereotypeAdviceConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationFactoryImpl.init();
+	ApplyStereotypeAdviceConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Apply Stereotype Advice Configuration</em>'.
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationPackage.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationPackage.java
index 3d34ff024ac..1fad8c1293f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationPackage.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory
  * @model kind="package"
  * @generated
  */
@@ -65,14 +65,14 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	ApplyStereotypeAdviceConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl.init();
+	ApplyStereotypeAdviceConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl <em>Apply Stereotype Advice Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl <em>Apply Stereotype Advice Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getApplyStereotypeAdviceConfiguration()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getApplyStereotypeAdviceConfiguration()
 	 * @generated
 	 */
 	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION = 0;
@@ -168,11 +168,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getStereotypeToApply()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getStereotypeToApply()
 	 * @generated
 	 */
 	int STEREOTYPE_TO_APPLY = 1;
@@ -223,11 +223,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int STEREOTYPE_TO_APPLY_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureToSet()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureToSet()
 	 * @generated
 	 */
 	int FEATURE_TO_SET = 2;
@@ -260,11 +260,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int FEATURE_TO_SET_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureValue()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureValue()
 	 * @generated
 	 */
 	int FEATURE_VALUE = 3;
@@ -279,11 +279,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int FEATURE_VALUE_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getListValue()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getListValue()
 	 * @generated
 	 */
 	int LIST_VALUE = 4;
@@ -307,11 +307,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int LIST_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getConstantValue()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getConstantValue()
 	 * @generated
 	 */
 	int CONSTANT_VALUE = 5;
@@ -335,11 +335,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int CONSTANT_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getDynamicValue()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getDynamicValue()
 	 * @generated
 	 */
 	int DYNAMIC_VALUE = 6;
@@ -354,11 +354,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int DYNAMIC_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getQueryExecutionValue()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getQueryExecutionValue()
 	 * @generated
 	 */
 	int QUERY_EXECUTION_VALUE = 7;
@@ -374,180 +374,180 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration <em>Apply Stereotype Advice Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration <em>Apply Stereotype Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Apply Stereotype Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration
 	 * @generated
 	 */
 	EClass getApplyStereotypeAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Stereotypes To Apply</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration#getStereotypesToApply()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration#getStereotypesToApply()
 	 * @see #getApplyStereotypeAdviceConfiguration()
 	 * @generated
 	 */
 	EReference getApplyStereotypeAdviceConfiguration_StereotypesToApply();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply <em>Stereotype To Apply</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply <em>Stereotype To Apply</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Stereotype To Apply</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply
 	 * @generated
 	 */
 	EClass getStereotypeToApply();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Stereotype Qualified Name</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName()
 	 * @see #getStereotypeToApply()
 	 * @generated
 	 */
 	EAttribute getStereotypeToApply_StereotypeQualifiedName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Update Name</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName()
 	 * @see #getStereotypeToApply()
 	 * @generated
 	 */
 	EAttribute getStereotypeToApply_UpdateName();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Required Profiles</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getRequiredProfiles()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getRequiredProfiles()
 	 * @see #getStereotypeToApply()
 	 * @generated
 	 */
 	EAttribute getStereotypeToApply_RequiredProfiles();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Features To Set</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getFeaturesToSet()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getFeaturesToSet()
 	 * @see #getStereotypeToApply()
 	 * @generated
 	 */
 	EReference getStereotypeToApply_FeaturesToSet();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet <em>Feature To Set</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet <em>Feature To Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature To Set</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet
 	 * @generated
 	 */
 	EClass getFeatureToSet();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Feature Name</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName()
 	 * @see #getFeatureToSet()
 	 * @generated
 	 */
 	EAttribute getFeatureToSet_FeatureName();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue <em>Value</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue()
 	 * @see #getFeatureToSet()
 	 * @generated
 	 */
 	EReference getFeatureToSet_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue <em>Feature Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue <em>Feature Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature Value</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue
 	 * @generated
 	 */
 	EClass getFeatureValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue <em>List Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue <em>List Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>List Value</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue
 	 * @generated
 	 */
 	EClass getListValue();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue#getValues <em>Values</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue#getValues <em>Values</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Values</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue#getValues()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue#getValues()
 	 * @see #getListValue()
 	 * @generated
 	 */
 	EReference getListValue_Values();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue <em>Constant Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue <em>Constant Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Constant Value</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue
 	 * @generated
 	 */
 	EClass getConstantValue();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Value Instance</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance()
 	 * @see #getConstantValue()
 	 * @generated
 	 */
 	EReference getConstantValue_ValueInstance();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue <em>Dynamic Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue <em>Dynamic Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Dynamic Value</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue
 	 * @generated
 	 */
 	EClass getDynamicValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Query Execution Value</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue
 	 * @generated
 	 */
 	EClass getQueryExecutionValue();
@@ -575,11 +575,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl <em>Apply Stereotype Advice Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl <em>Apply Stereotype Advice Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getApplyStereotypeAdviceConfiguration()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getApplyStereotypeAdviceConfiguration()
 		 * @generated
 		 */
 		EClass APPLY_STEREOTYPE_ADVICE_CONFIGURATION = eINSTANCE.getApplyStereotypeAdviceConfiguration();
@@ -593,11 +593,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY = eINSTANCE.getApplyStereotypeAdviceConfiguration_StereotypesToApply();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getStereotypeToApply()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getStereotypeToApply()
 		 * @generated
 		 */
 		EClass STEREOTYPE_TO_APPLY = eINSTANCE.getStereotypeToApply();
@@ -635,11 +635,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference STEREOTYPE_TO_APPLY__FEATURES_TO_SET = eINSTANCE.getStereotypeToApply_FeaturesToSet();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureToSet()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureToSet()
 		 * @generated
 		 */
 		EClass FEATURE_TO_SET = eINSTANCE.getFeatureToSet();
@@ -661,21 +661,21 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference FEATURE_TO_SET__VALUE = eINSTANCE.getFeatureToSet_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureValue()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureValue()
 		 * @generated
 		 */
 		EClass FEATURE_VALUE = eINSTANCE.getFeatureValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getListValue()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getListValue()
 		 * @generated
 		 */
 		EClass LIST_VALUE = eINSTANCE.getListValue();
@@ -689,11 +689,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference LIST_VALUE__VALUES = eINSTANCE.getListValue_Values();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getConstantValue()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getConstantValue()
 		 * @generated
 		 */
 		EClass CONSTANT_VALUE = eINSTANCE.getConstantValue();
@@ -707,21 +707,21 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference CONSTANT_VALUE__VALUE_INSTANCE = eINSTANCE.getConstantValue_ValueInstance();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getDynamicValue()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getDynamicValue()
 		 * @generated
 		 */
 		EClass DYNAMIC_VALUE = eINSTANCE.getDynamicValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getQueryExecutionValue()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getQueryExecutionValue()
 		 * @generated
 		 */
 		EClass QUERY_EXECUTION_VALUE = eINSTANCE.getQueryExecutionValue();
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ConstantValue.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ConstantValue.java
index 202c2c2b92e..a748f6c6294 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ConstantValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ConstantValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 import org.eclipse.uml2.uml.ValueSpecification;
 
@@ -23,10 +23,10 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getConstantValue()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getConstantValue()
  * @model
  * @generated
  */
@@ -41,14 +41,14 @@ public interface ConstantValue extends FeatureValue {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value Instance</em>' containment reference.
 	 * @see #setValueInstance(ValueSpecification)
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getConstantValue_ValueInstance()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getConstantValue_ValueInstance()
 	 * @model containment="true"
 	 * @generated
 	 */
 	ValueSpecification getValueInstance();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value Instance</em>' containment reference.
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/DynamicValue.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/DynamicValue.java
index f4ed71dbcb7..1c4562f0a5e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/DynamicValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/DynamicValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 
 /**
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotype
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getDynamicValue()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getDynamicValue()
  * @model abstract="true"
  * @generated
  */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureToSet.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureToSet.java
index d687e763aca..297392d5cb0 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureToSet.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureToSet.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -23,11 +23,11 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue <em>Value</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureToSet()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureToSet()
  * @model
  * @generated
  */
@@ -42,14 +42,14 @@ public interface FeatureToSet extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature Name</em>' attribute.
 	 * @see #setFeatureName(String)
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureToSet_FeatureName()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureToSet_FeatureName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getFeatureName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature Name</em>' attribute.
@@ -68,14 +68,14 @@ public interface FeatureToSet extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' containment reference.
 	 * @see #setValue(FeatureValue)
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureToSet_Value()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureToSet_Value()
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
 	FeatureValue getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' containment reference.
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureValue.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureValue.java
index ccecf5efae6..9a26a62b750 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureValue()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureValue()
  * @model abstract="true"
  * @generated
  */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ListValue.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ListValue.java
index d6cc87e235b..bfc5d114d32 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ListValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ListValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -23,17 +23,17 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue#getValues <em>Values</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue#getValues <em>Values</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getListValue()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getListValue()
  * @model
  * @generated
  */
 public interface ListValue extends FeatureValue {
 	/**
 	 * Returns the value of the '<em><b>Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue}.
+	 * The list contents are of type {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Values</em>' containment reference list isn't clear,
@@ -41,7 +41,7 @@ public interface ListValue extends FeatureValue {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Values</em>' containment reference list.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getListValue_Values()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getListValue_Values()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/QueryExecutionValue.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/QueryExecutionValue.java
index c178684be97..2408f9d7f90 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/QueryExecutionValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/QueryExecutionValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 
 /**
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotype
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getQueryExecutionValue()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getQueryExecutionValue()
  * @model
  * @generated
  */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeToApply.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeToApply.java
index 3ecd8dedce0..e1d2575626e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeToApply.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeToApply.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -25,13 +25,13 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply()
  * @model
  * @generated
  */
@@ -46,14 +46,14 @@ public interface StereotypeToApply extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotype Qualified Name</em>' attribute.
 	 * @see #setStereotypeQualifiedName(String)
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_StereotypeQualifiedName()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_StereotypeQualifiedName()
 	 * @model
 	 * @generated
 	 */
 	String getStereotypeQualifiedName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Stereotype Qualified Name</em>' attribute.
@@ -72,14 +72,14 @@ public interface StereotypeToApply extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Update Name</em>' attribute.
 	 * @see #setUpdateName(boolean)
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_UpdateName()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_UpdateName()
 	 * @model
 	 * @generated
 	 */
 	boolean isUpdateName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Update Name</em>' attribute.
@@ -98,7 +98,7 @@ public interface StereotypeToApply extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Required Profiles</em>' attribute list.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_RequiredProfiles()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_RequiredProfiles()
 	 * @model required="true"
 	 * @generated
 	 */
@@ -106,7 +106,7 @@ public interface StereotypeToApply extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Features To Set</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet}.
+	 * The list contents are of type {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Features To Set</em>' containment reference list isn't clear,
@@ -114,7 +114,7 @@ public interface StereotypeToApply extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Features To Set</em>' containment reference list.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_FeaturesToSet()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_FeaturesToSet()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationFactoryImpl.java
index 31e82b92ac1..174755c41e6 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationImpl.java
index a7fcd96650d..405e057a714 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import java.util.Collection;
 
@@ -26,9 +26,9 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypea
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationPackageImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationPackageImpl.java
index 52ead761192..32a8c3101ad 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationPackageImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationPackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -22,16 +22,16 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
 
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -109,7 +109,7 @@ public class ApplyStereotypeAdviceConfigurationPackageImpl extends EPackageImpl
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ConstantValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ConstantValueImpl.java
index 914f5a554b7..318f6e6be64 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ConstantValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ConstantValueImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue;
 
 import org.eclipse.uml2.uml.ValueSpecification;
 
@@ -33,7 +33,7 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/DynamicValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/DynamicValueImpl.java
index c25cfe8c2f1..4f1696fb378 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/DynamicValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/DynamicValueImpl.java
@@ -10,12 +10,12 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureToSetImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureToSetImpl.java
index 9d86e49679f..002a9326aca 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureToSetImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureToSetImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypea
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureValueImpl.java
index e9d3e075904..2f72d8b7c46 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureValueImpl.java
@@ -10,14 +10,14 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ListValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ListValueImpl.java
index 86a2a5af85f..12b75988ea4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ListValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ListValueImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import java.util.Collection;
 
@@ -24,9 +24,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypea
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/QueryExecutionValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/QueryExecutionValueImpl.java
index cd31dc75e8d..78a0acaa510 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/QueryExecutionValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/QueryExecutionValueImpl.java
@@ -10,12 +10,12 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/StereotypeToApplyImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/StereotypeToApplyImpl.java
index 23e4c6dc7ec..36c3d0c47b9 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/StereotypeToApplyImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/StereotypeToApplyImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
 
 import java.util.Collection;
 
@@ -29,9 +29,9 @@ import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,10 +41,10 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypea
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#isUpdateName <em>Update Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#getRequiredProfiles <em>Required Profiles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#getFeaturesToSet <em>Features To Set</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#isUpdateName <em>Update Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#getRequiredProfiles <em>Required Profiles</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#getFeaturesToSet <em>Features To Set</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationEditPlugin.java
index fd4a888bada..4d73df956f8 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationEditPlugin.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProvider.java
index 887db1dd702..e90c123c3e4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 
 import java.util.Collection;
@@ -28,12 +28,12 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AbstractAdviceBindingConfigurationItemProvider;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory.java
index eaebc1f6eed..bd2dc9e41a9 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,9 +46,9 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationAdapterFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -99,7 +99,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -107,7 +107,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected ApplyStereotypeAdviceConfigurationItemProvider applyStereotypeAdviceConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -122,7 +122,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -130,7 +130,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected StereotypeToApplyItemProvider stereotypeToApplyItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -145,7 +145,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -153,7 +153,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected FeatureToSetItemProvider featureToSetItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -168,7 +168,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -176,7 +176,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected ListValueItemProvider listValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -191,7 +191,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -199,7 +199,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected ConstantValueItemProvider constantValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -214,7 +214,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -222,7 +222,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected QueryExecutionValueItemProvider queryExecutionValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ConstantValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ConstantValueItemProvider.java
index 460adb83ff5..3ff0b320a52 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ConstantValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ConstantValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 
 import java.util.Collection;
@@ -24,13 +24,13 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue;
 
 import org.eclipse.uml2.uml.UMLFactory;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/DynamicValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/DynamicValueItemProvider.java
index 910a72e771b..ef091c995b4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/DynamicValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/DynamicValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 
 import java.util.Collection;
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureToSetItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureToSetItemProvider.java
index 27caf697cf3..8c524f91e55 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureToSetItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureToSetItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 
 import java.util.Collection;
@@ -34,12 +34,12 @@ 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.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureValueItemProvider.java
index 7c5062037c8..9dc77ee51ee 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 
 import java.util.Collection;
@@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ListValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ListValueItemProvider.java
index e9e0dcc9267..9216e8e80c3 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ListValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ListValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 
 import java.util.Collection;
@@ -22,10 +22,10 @@ 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.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/QueryExecutionValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/QueryExecutionValueItemProvider.java
index a4bc0b15837..82fe5821b2b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/QueryExecutionValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/QueryExecutionValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 
 import java.util.Collection;
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/StereotypeToApplyItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/StereotypeToApplyItemProvider.java
index 62814c79b29..375cb4a7f8c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/StereotypeToApplyItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/StereotypeToApplyItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
 
 
 import java.util.Collection;
@@ -34,12 +34,12 @@ 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.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationAdapterFactory.java
index 2edba6c3f24..01046bac0e6 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -24,14 +24,14 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage
  * @generated
  */
 public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl {
@@ -151,13 +151,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration <em>Apply Stereotype Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration <em>Apply Stereotype Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createApplyStereotypeAdviceConfigurationAdapter() {
@@ -165,13 +165,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply <em>Stereotype To Apply</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply <em>Stereotype To Apply</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply
 	 * @generated
 	 */
 	public Adapter createStereotypeToApplyAdapter() {
@@ -179,13 +179,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet <em>Feature To Set</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet <em>Feature To Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet
 	 * @generated
 	 */
 	public Adapter createFeatureToSetAdapter() {
@@ -193,13 +193,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue <em>Feature Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue <em>Feature Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue
 	 * @generated
 	 */
 	public Adapter createFeatureValueAdapter() {
@@ -207,13 +207,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue <em>List Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue <em>List Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue
 	 * @generated
 	 */
 	public Adapter createListValueAdapter() {
@@ -221,13 +221,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue <em>Constant Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue <em>Constant Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue
 	 * @generated
 	 */
 	public Adapter createConstantValueAdapter() {
@@ -235,13 +235,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue <em>Dynamic Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue <em>Dynamic Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue
 	 * @generated
 	 */
 	public Adapter createDynamicValueAdapter() {
@@ -249,13 +249,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue
 	 * @generated
 	 */
 	public Adapter createQueryExecutionValueAdapter() {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceFactoryImpl.java
index 4facfdade23..f56607c7dfb 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationResourceImpl
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationResourceImpl
  * @generated
  */
 public class ApplyStereotypeAdviceConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceImpl.java
index 0ce383d9c2c..333f1b7ddf4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationResourceFactoryImpl
  * @generated
  */
 public class ApplyStereotypeAdviceConfigurationResourceImpl extends XMLResourceImpl {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationSwitch.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationSwitch.java
index 87bbea54d70..60c2ac6ae82 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationSwitch.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationSwitch.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
@@ -22,7 +22,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypea
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage
  * @generated
  */
 public class ApplyStereotypeAdviceConfigurationSwitch<T> extends Switch<T> {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationXMLProcessor.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationXMLProcessor.java
index 0d331211392..e18d7dba47e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationXMLProcessor.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationXMLProcessor.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
 
 import java.util.Map;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfiguration.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfiguration.java
index ab20d444eb4..ebf60c01104 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfiguration.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
 
@@ -23,12 +23,12 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration()
  * @model
  * @generated
  */
@@ -43,14 +43,14 @@ public interface InvariantStereotypeRuleConfiguration extends InvariantRuleConfi
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotype Qualified Name</em>' attribute.
 	 * @see #setStereotypeQualifiedName(String)
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_StereotypeQualifiedName()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_StereotypeQualifiedName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getStereotypeQualifiedName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Stereotype Qualified Name</em>' attribute.
@@ -69,14 +69,14 @@ public interface InvariantStereotypeRuleConfiguration extends InvariantRuleConfi
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Required Profile</em>' attribute.
 	 * @see #setRequiredProfile(String)
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_RequiredProfile()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_RequiredProfile()
 	 * @model
 	 * @generated
 	 */
 	String getRequiredProfile();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Required Profile</em>' attribute.
@@ -95,14 +95,14 @@ public interface InvariantStereotypeRuleConfiguration extends InvariantRuleConfi
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Strict</em>' attribute.
 	 * @see #setStrict(boolean)
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_Strict()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_Strict()
 	 * @model required="true"
 	 * @generated
 	 */
 	boolean isStrict();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Strict</em>' attribute.
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationFactory.java
index efd6104f010..2ecb0e75fc2 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage
  * @generated
  */
 public interface InvariantStereotypeRuleConfigurationFactory extends EFactory {
@@ -29,7 +29,7 @@ public interface InvariantStereotypeRuleConfigurationFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	InvariantStereotypeRuleConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationFactoryImpl.init();
+	InvariantStereotypeRuleConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Invariant Stereotype Rule Configuration</em>'.
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationPackage.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationPackage.java
index aefc97d6f24..e5460aa265b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationPackage.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationFactory
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationFactory
  * @model kind="package"
  * @generated
  */
@@ -65,14 +65,14 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	InvariantStereotypeRuleConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationPackageImpl.init();
+	InvariantStereotypeRuleConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl <em>Invariant Stereotype Rule Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl <em>Invariant Stereotype Rule Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationPackageImpl#getInvariantStereotypeRuleConfiguration()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationPackageImpl#getInvariantStereotypeRuleConfiguration()
 	 * @generated
 	 */
 	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION = 0;
@@ -124,43 +124,43 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration <em>Invariant Stereotype Rule Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration <em>Invariant Stereotype Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Invariant Stereotype Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration
 	 * @generated
 	 */
 	EClass getInvariantStereotypeRuleConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Stereotype Qualified Name</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName()
 	 * @see #getInvariantStereotypeRuleConfiguration()
 	 * @generated
 	 */
 	EAttribute getInvariantStereotypeRuleConfiguration_StereotypeQualifiedName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Required Profile</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile()
 	 * @see #getInvariantStereotypeRuleConfiguration()
 	 * @generated
 	 */
 	EAttribute getInvariantStereotypeRuleConfiguration_RequiredProfile();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Strict</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict()
 	 * @see #getInvariantStereotypeRuleConfiguration()
 	 * @generated
 	 */
@@ -190,11 +190,11 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl <em>Invariant Stereotype Rule Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl <em>Invariant Stereotype Rule Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationPackageImpl#getInvariantStereotypeRuleConfiguration()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationPackageImpl#getInvariantStereotypeRuleConfiguration()
 		 * @generated
 		 */
 		EClass INVARIANT_STEREOTYPE_RULE_CONFIGURATION = eINSTANCE.getInvariantStereotypeRuleConfiguration();
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationFactoryImpl.java
index 6afcddcb82e..c39f35bec40 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationImpl.java
index c1005f0da2f..3f6d79c85db 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,9 +31,9 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereot
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl#getRequiredProfile <em>Required Profile</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl#isStrict <em>Strict</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl#getRequiredProfile <em>Required Profile</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl#isStrict <em>Strict</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationPackageImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationPackageImpl.java
index 4794288aa29..c5d17abb3d6 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationPackageImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationPackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationFactory;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,7 +50,7 @@ public class InvariantStereotypeRuleConfigurationPackageImpl extends EPackageImp
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationEditPlugin.java
index 6f020de824b..e9d575a62fb 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationEditPlugin.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProvider.java
index 1c3eb322dfa..d00cab75979 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider;
 
 
 import java.util.Collection;
@@ -28,11 +28,11 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantRuleConfigurationItemProvider;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProviderAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProviderAdapterFactory.java
index 85074cb2438..ecf2d1a1c68 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProviderAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -48,9 +48,9 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationSwitch;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationFactory;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationAdapterFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -101,7 +101,7 @@ public class InvariantStereotypeRuleConfigurationItemProviderAdapterFactory exte
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -109,7 +109,7 @@ public class InvariantStereotypeRuleConfigurationItemProviderAdapterFactory exte
 	protected InvariantStereotypeRuleConfigurationItemProvider invariantStereotypeRuleConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationAdapterFactory.java
index 93cfbff091f..fa5f632c4b5 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -21,14 +21,14 @@ import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage
  * @generated
  */
 public class InvariantStereotypeRuleConfigurationAdapterFactory extends AdapterFactoryImpl {
@@ -109,13 +109,13 @@ public class InvariantStereotypeRuleConfigurationAdapterFactory extends AdapterF
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration <em>Invariant Stereotype Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration <em>Invariant Stereotype Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration
 	 * @generated
 	 */
 	public Adapter createInvariantStereotypeRuleConfigurationAdapter() {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceFactoryImpl.java
index ad8386492a6..6a79877fa49 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationResourceImpl
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationResourceImpl
  * @generated
  */
 public class InvariantStereotypeRuleConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceImpl.java
index ca0b276b020..630d7012f8e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationResourceFactoryImpl
  * @generated
  */
 public class InvariantStereotypeRuleConfigurationResourceImpl extends XMLResourceImpl {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationSwitch.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationSwitch.java
index 2f24a68b388..c5d60527ca7 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationSwitch.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationSwitch.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.util.Switch;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereot
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage
  * @generated
  */
 public class InvariantStereotypeRuleConfigurationSwitch<T> extends Switch<T> {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationXMLProcessor.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationXMLProcessor.java
index 3b45598abcf..405c98c22ec 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationXMLProcessor.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationXMLProcessor.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
 
 import java.util.Map;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfiguration.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfiguration.java
index 91f3043d479..676976b5fef 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfiguration.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -25,11 +25,11 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindin
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getValidTypes <em>Valid Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getCreationTypes <em>Creation Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getValidTypes <em>Valid Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getCreationTypes <em>Creation Types</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration()
  * @model
  * @generated
  */
@@ -44,7 +44,7 @@ public interface SetTypeAdviceConfiguration extends AbstractAdviceBindingConfigu
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Valid Types</em>' attribute list.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration_ValidTypes()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration_ValidTypes()
 	 * @model
 	 * @generated
 	 */
@@ -60,7 +60,7 @@ public interface SetTypeAdviceConfiguration extends AbstractAdviceBindingConfigu
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Creation Types</em>' attribute list.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration_CreationTypes()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration_CreationTypes()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationFactory.java
index 9ae44e0bd15..4c391391d5d 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage
  * @generated
  */
 public interface SetTypeAdviceConfigurationFactory extends EFactory {
@@ -29,7 +29,7 @@ public interface SetTypeAdviceConfigurationFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	SetTypeAdviceConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationFactoryImpl.init();
+	SetTypeAdviceConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Set Type Advice Configuration</em>'.
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationPackage.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationPackage.java
index 1afef4ff600..e565c9eaee7 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationPackage.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationFactory
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationFactory
  * @model kind="package"
  * @generated
  */
@@ -65,14 +65,14 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	SetTypeAdviceConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationPackageImpl.init();
+	SetTypeAdviceConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl <em>Set Type Advice Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl <em>Set Type Advice Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationPackageImpl#getSetTypeAdviceConfiguration()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationPackageImpl#getSetTypeAdviceConfiguration()
 	 * @generated
 	 */
 	int SET_TYPE_ADVICE_CONFIGURATION = 0;
@@ -187,32 +187,32 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration <em>Set Type Advice Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration <em>Set Type Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Set Type Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration
 	 * @generated
 	 */
 	EClass getSetTypeAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getValidTypes <em>Valid Types</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getValidTypes <em>Valid Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Valid Types</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getValidTypes()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getValidTypes()
 	 * @see #getSetTypeAdviceConfiguration()
 	 * @generated
 	 */
 	EAttribute getSetTypeAdviceConfiguration_ValidTypes();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getCreationTypes <em>Creation Types</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getCreationTypes <em>Creation Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Creation Types</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getCreationTypes()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getCreationTypes()
 	 * @see #getSetTypeAdviceConfiguration()
 	 * @generated
 	 */
@@ -242,11 +242,11 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl <em>Set Type Advice Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl <em>Set Type Advice Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationPackageImpl#getSetTypeAdviceConfiguration()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationPackageImpl#getSetTypeAdviceConfiguration()
 		 * @generated
 		 */
 		EClass SET_TYPE_ADVICE_CONFIGURATION = eINSTANCE.getSetTypeAdviceConfiguration();
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationFactoryImpl.java
index 73a0dc5c51e..4820813fb00 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationImpl.java
index 94a3344997e..906dc64ec3c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl;
 
 import java.util.Collection;
 
@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadvicecon
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl#getValidTypes <em>Valid Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl#getCreationTypes <em>Creation Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl#getValidTypes <em>Valid Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl#getCreationTypes <em>Creation Types</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationPackageImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationPackageImpl.java
index 7b427b4f42d..fa472a7ee8e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationPackageImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationPackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,7 +50,7 @@ public class SetTypeAdviceConfigurationPackageImpl extends EPackageImpl implemen
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationEditPlugin.java
index 31bcd53c1b1..c86f9f7d80c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationEditPlugin.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProvider.java
index def987379ba..0388156db0d 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider;
 
 
 import java.util.Collection;
@@ -28,11 +28,11 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AbstractAdviceBindingConfigurationItemProvider;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProviderAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProviderAdapterFactory.java
index 9027c3dd58b..ef569f1801a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProviderAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,9 +46,9 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationFactory;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.util.SetTypeAdviceConfigurationAdapterFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.util.SetTypeAdviceConfigurationAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -99,7 +99,7 @@ public class SetTypeAdviceConfigurationItemProviderAdapterFactory extends SetTyp
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -107,7 +107,7 @@ public class SetTypeAdviceConfigurationItemProviderAdapterFactory extends SetTyp
 	protected SetTypeAdviceConfigurationItemProvider setTypeAdviceConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationAdapterFactory.java
index ec766df19db..6c0908a577b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -24,14 +24,14 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage
  * @generated
  */
 public class SetTypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl {
@@ -123,13 +123,13 @@ public class SetTypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration <em>Set Type Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration <em>Set Type Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createSetTypeAdviceConfigurationAdapter() {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationSwitch.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationSwitch.java
index 218702c5c01..d9b6eeb3985 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationSwitch.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationSwitch.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
@@ -22,7 +22,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadvicecon
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage
  * @generated
  */
 public class SetTypeAdviceConfigurationSwitch<T> extends Switch<T> {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfiguration.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfiguration.java
index 9544634fd1a..8dfbed9ffe4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfiguration.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -25,11 +25,11 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfi
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#getStereotypeApplicationMatcherConfiguration()
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#getStereotypeApplicationMatcherConfiguration()
  * @model
  * @generated
  */
@@ -44,7 +44,7 @@ public interface StereotypeApplicationMatcherConfiguration extends AbstractMatch
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotypes Qualified Names</em>' attribute list.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#getStereotypeApplicationMatcherConfiguration_StereotypesQualifiedNames()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#getStereotypeApplicationMatcherConfiguration_StereotypesQualifiedNames()
 	 * @model required="true"
 	 * @generated
 	 */
@@ -60,14 +60,14 @@ public interface StereotypeApplicationMatcherConfiguration extends AbstractMatch
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Profile Uri</em>' attribute.
 	 * @see #setProfileUri(String)
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#getStereotypeApplicationMatcherConfiguration_ProfileUri()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#getStereotypeApplicationMatcherConfiguration_ProfileUri()
 	 * @model
 	 * @generated
 	 */
 	String getProfileUri();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Profile Uri</em>' attribute.
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationFactory.java
index 1916f4eb87c..7b9cd71ef7b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage
  * @generated
  */
 public interface StereotypeApplicationMatcherConfigurationFactory extends EFactory {
@@ -29,7 +29,7 @@ public interface StereotypeApplicationMatcherConfigurationFactory extends EFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	StereotypeApplicationMatcherConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationFactoryImpl.init();
+	StereotypeApplicationMatcherConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Stereotype Application Matcher Configuration</em>'.
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationPackage.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationPackage.java
index ebf0a720b18..fb569dc677e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationPackage.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory
  * @model kind="package"
  * @generated
  */
@@ -65,14 +65,14 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	StereotypeApplicationMatcherConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationPackageImpl.init();
+	StereotypeApplicationMatcherConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl <em>Stereotype Application Matcher Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl <em>Stereotype Application Matcher Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationPackageImpl#getStereotypeApplicationMatcherConfiguration()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationPackageImpl#getStereotypeApplicationMatcherConfiguration()
 	 * @generated
 	 */
 	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION = 0;
@@ -115,32 +115,32 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration <em>Stereotype Application Matcher Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration <em>Stereotype Application Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Stereotype Application Matcher Configuration</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration
 	 * @generated
 	 */
 	EClass getStereotypeApplicationMatcherConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Stereotypes Qualified Names</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames()
 	 * @see #getStereotypeApplicationMatcherConfiguration()
 	 * @generated
 	 */
 	EAttribute getStereotypeApplicationMatcherConfiguration_StereotypesQualifiedNames();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Profile Uri</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri()
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri()
 	 * @see #getStereotypeApplicationMatcherConfiguration()
 	 * @generated
 	 */
@@ -170,11 +170,11 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl <em>Stereotype Application Matcher Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl <em>Stereotype Application Matcher Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl
-		 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationPackageImpl#getStereotypeApplicationMatcherConfiguration()
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl
+		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationPackageImpl#getStereotypeApplicationMatcherConfiguration()
 		 * @generated
 		 */
 		EClass STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION = eINSTANCE.getStereotypeApplicationMatcherConfiguration();
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationFactoryImpl.java
index ed94d24e30c..f379028f92a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationImpl.java
index 160a6124fbf..e22db10c9fb 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl;
 
 import java.util.Collection;
 
@@ -26,8 +26,8 @@ import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractMatcherConfigurationImpl;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,8 +37,8 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplic
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl#getProfileUri <em>Profile Uri</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl#getProfileUri <em>Profile Uri</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationPackageImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationPackageImpl.java
index 0c0c5d4922d..80e37c845d9 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationPackageImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationPackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,7 +50,7 @@ public class StereotypeApplicationMatcherConfigurationPackageImpl extends EPacka
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationEditPlugin.java
index 0d441b1fcf4..998b14c66e5 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationEditPlugin.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProvider.java
index 80368586000..6c74ede345c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider;
 
 
 import java.util.Collection;
@@ -28,11 +28,11 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AbstractMatcherConfigurationItemProvider;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory.java
index ae134cacfa5..1e30d1c9948 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -48,9 +48,9 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeCo
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationAdapterFactory;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -101,7 +101,7 @@ public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -109,7 +109,7 @@ public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory
 	protected StereotypeApplicationMatcherConfigurationItemProvider stereotypeApplicationMatcherConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationAdapterFactory.java
index 1cb88b7616a..0d603c5e7d4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -21,14 +21,14 @@ import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage
  * @generated
  */
 public class StereotypeApplicationMatcherConfigurationAdapterFactory extends AdapterFactoryImpl {
@@ -108,13 +108,13 @@ public class StereotypeApplicationMatcherConfigurationAdapterFactory extends Ada
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration <em>Stereotype Application Matcher Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration <em>Stereotype Application Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration
 	 * @generated
 	 */
 	public Adapter createStereotypeApplicationMatcherConfigurationAdapter() {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceFactoryImpl.java
index e5394885b98..00db4a23764 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationResourceImpl
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationResourceImpl
  * @generated
  */
 public class StereotypeApplicationMatcherConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceImpl.java
index 3f1167327b0..4f2f11dc978 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationResourceFactoryImpl
  * @generated
  */
 public class StereotypeApplicationMatcherConfigurationResourceImpl extends XMLResourceImpl {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationSwitch.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationSwitch.java
index ea2807a3b07..1511afa9ce0 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationSwitch.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationSwitch.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.util.Switch;
 
 import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.*;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplic
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage
+ * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage
  * @generated
  */
 public class StereotypeApplicationMatcherConfigurationSwitch<T> extends Switch<T> {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationXMLProcessor.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationXMLProcessor.java
index d8c588d147b..45f3f423e53 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationXMLProcessor.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationXMLProcessor.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
 
 import java.util.Map;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
 
-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/Activator.java
index ba8f8890d22..812dfa53fd0 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/Activator.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations;

+package org.eclipse.papyrus.uml.elementtypesconfigurations;

 

 import org.eclipse.papyrus.infra.core.log.LogHelper;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

@@ -27,7 +27,7 @@ public final class Activator extends AbstractUIPlugin {
 

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.tools.elementtypesconfigurations"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.elementtypesconfigurations"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator INSTANCE;

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceEditHelperAdvice.java
index 2956bd061c1..695c47d5555 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceEditHelperAdvice.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;

+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -22,10 +22,15 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.Activator;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.Activator;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;

+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

 import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.Stereotype;

@@ -120,14 +125,29 @@ public class ApplyStereotypeAdviceEditHelperAdvice extends AbstractEditHelperAdv
 			Stereotype stereotype = ((Element) elementToConfigure).getApplicableStereotype(stereotypeToApply.getStereotypeQualifiedName());

 

 			if (stereotype != null) {

-				ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(editingDomain, (Element) elementToConfigure, stereotype, stereotypeToApply.isUpdateName());

+

+				ICommand applyStereotypeCommand = service.getEditCommand(new ApplyStereotypeRequest((Element) elementToConfigure, stereotype, editingDomain));

+

 				if (resultCommand == null) {

 					resultCommand = applyStereotypeCommand;

 				} else {

 					resultCommand = resultCommand.compose(applyStereotypeCommand);

 				}

 

-				// apply values

+				if (stereotypeToApply.isUpdateName() && elementToConfigure instanceof NamedElement) {

+					if (((NamedElement) elementToConfigure).getNamespace() != null) {

+						String newName = NamedElementUtil.getDefaultNameWithIncrementFromBase(stereotype.getName(), ((NamedElement) elementToConfigure).getNamespace().getMembers());

+						ICommand renameCommand = service.getEditCommand(new SetRequest(editingDomain, elementToConfigure, UMLPackage.eINSTANCE.getNamedElement_Name(), newName));

+

+						if (resultCommand == null) {

+							resultCommand = renameCommand;

+						} else {

+							resultCommand = resultCommand.compose(renameCommand);

+						}

+					}

+				}

+

+				// Set values

 				for (FeatureToSet featureToSet : stereotypeToApply.getFeaturesToSet()) {

 					// retrieve feature value

 					ICommand command = getSetStereotypeFeatureValueCommand((Element) elementToConfigure, stereotype, featureToSet.getFeatureName(), featureToSet.getValue(), service, request);

@@ -179,8 +199,7 @@ public class ApplyStereotypeAdviceEditHelperAdvice extends AbstractEditHelperAdv
 		}

 		Object value = getStereotypeValue(elementToConfigure, stereotype, typedElement.getType(), featureValue);

 

-		return new SetStereotypeValueCommand(configureRequest.getEditingDomain(), elementToConfigure, stereotype, name, value);

-

+		return service.getEditCommand(new SetStereotypeValueRequest(configureRequest.getEditingDomain(), stereotype, (Element) elementToConfigure, name, value));

 	}

 

 

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceFactory.java
index d7ace5a145e..7a6827fdaf5 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceFactory.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;

+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;

 

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

 import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeFeatureValueUtils.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeFeatureValueUtils.java
index 9f566979773..98579b2db50 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeFeatureValueUtils.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeFeatureValueUtils.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;

+package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

 import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter.ConverterNotfoundException;

 import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter.ConverterRegistry;

-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationSwitch;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationSwitch;

 import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Enumeration;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/AbstractProfilingCommand.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/AbstractProfilingCommand.java
new file mode 100644
index 00000000000..b967dd1822b
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/AbstractProfilingCommand.java
@@ -0,0 +1,79 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractProfilingCommand extends AbstractTransactionalCommand {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param domain
+	 * @param label
+	 * @param affectedFiles
+	 */
+	public AbstractProfilingCommand(TransactionalEditingDomain domain, String label, List<Object> affectedFiles) {
+		super(domain, label, affectedFiles);
+	}
+
+	protected static List<Object> getAffectedFiles(IEditCommandRequest request) {
+		List<Object> result = new ArrayList<Object>();
+		List<?> elements = request.getElementsToEdit();
+		int size;
+		if (elements != null && ((size = elements.size()) > 0)) {
+			if (size == 1) {
+				Resource resource = ((EObject) elements.get(0)).eResource();
+				if (resource != null) {
+					IFile file = WorkspaceSynchronizer.getFile(resource);
+					if (file != null) {
+						result.add(file);
+					}
+				}
+			} else {
+				Map<Resource, Object> resourcesToFileMap = new HashMap<Resource, Object>();
+				for (int i = 0; i < size; ++i) {
+					Resource resource = ((EObject) elements.get(i)).eResource();
+					if (resource != null) {
+						Object file = resourcesToFileMap.get(resource);
+						// if it is in the Map, then it is in the List already as well
+						if (file == null) {
+							file = WorkspaceSynchronizer.getFile(resource);
+							if (file != null) {
+								resourcesToFileMap.put(resource, file);
+								result.add(file);
+							}
+						}
+					}
+				}
+			}
+		}
+		return result;
+	}
+
+
+
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyProfileCommand.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyProfileCommand.java
new file mode 100644
index 00000000000..096a2cd00d0
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyProfileCommand.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Profile;
+
+public class ApplyProfileCommand extends AbstractProfilingCommand {
+
+	private ApplyProfileRequest request;
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param request
+	 * @param domain
+	 * @param label
+	 */
+	public ApplyProfileCommand(ApplyProfileRequest request, TransactionalEditingDomain domain, String label) {
+		super(domain, label, getAffectedFiles(request));
+		this.request = request;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+	 *
+	 * @param monitor
+	 * @param info
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Package pkg = this.request.getUmlPackage();
+		Profile profile = this.request.getProfile();
+		try {
+			pkg.applyProfile(profile);
+		} catch (IllegalArgumentException e) {
+			return CommandResult.newErrorCommandResult(e);
+		}
+
+
+		return CommandResult.newOKCommandResult();
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyStereotypeCommand.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyStereotypeCommand.java
new file mode 100644
index 00000000000..197f8068172
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyStereotypeCommand.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+public class ApplyStereotypeCommand extends AbstractProfilingCommand {
+
+	private ApplyStereotypeRequest request;
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param request
+	 * @param domain
+	 * @param label
+	 */
+	public ApplyStereotypeCommand(ApplyStereotypeRequest request, TransactionalEditingDomain domain, String label) {
+		super(domain, label, getAffectedFiles(request));
+		this.request = request;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+	 *
+	 * @param monitor
+	 * @param info
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Element element = this.request.getUmlElement();
+		Stereotype stereotype = this.request.getStereotype();
+		try {
+			element.applyStereotype(stereotype);
+		} catch (IllegalArgumentException e) {
+			return CommandResult.newErrorCommandResult(e);
+		}
+
+
+		return CommandResult.newOKCommandResult();
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/SetStereotypeValueCommand.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/SetStereotypeValueCommand.java
new file mode 100644
index 00000000000..2c24d34d04c
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/SetStereotypeValueCommand.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+public class SetStereotypeValueCommand extends AbstractProfilingCommand {
+
+	private SetStereotypeValueRequest request;
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param request
+	 * @param domain
+	 * @param label
+	 */
+	public SetStereotypeValueCommand(SetStereotypeValueRequest request, TransactionalEditingDomain domain, String label) {
+		super(domain, label, getAffectedFiles(request));
+		this.request = request;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+	 *
+	 * @param monitor
+	 * @param info
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Element element = this.request.getUmlElement();
+		Stereotype stereotype = this.request.getStereotype();
+		String propertyName = this.request.getPropertyName();
+		Object value = this.request.getValue();
+		try {
+			element.setValue(stereotype, propertyName, value);
+		} catch (IllegalArgumentException e) {
+			return CommandResult.newErrorCommandResult(e);
+		}
+
+
+		return CommandResult.newOKCommandResult();
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyProfileCommand.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyProfileCommand.java
new file mode 100644
index 00000000000..4d1b2c79557
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyProfileCommand.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Profile;
+
+public class UnapplyProfileCommand extends AbstractProfilingCommand {
+
+	private UnapplyProfileRequest request;
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param request
+	 * @param domain
+	 * @param label
+	 */
+	public UnapplyProfileCommand(UnapplyProfileRequest request, TransactionalEditingDomain domain, String label) {
+		super(domain, label, getAffectedFiles(request));
+		this.request = request;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+	 *
+	 * @param monitor
+	 * @param info
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Package pkg = this.request.getUmlPackage();
+		Profile profile = this.request.getProfile();
+		try {
+			pkg.unapplyProfile(profile);
+		} catch (IllegalArgumentException e) {
+			return CommandResult.newErrorCommandResult(e);
+		}
+
+
+		return CommandResult.newOKCommandResult();
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyStereotypeCommand.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyStereotypeCommand.java
new file mode 100644
index 00000000000..be159c453c4
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyStereotypeCommand.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+public class UnapplyStereotypeCommand extends AbstractProfilingCommand {
+
+	private UnapplyStereotypeRequest request;
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param request
+	 * @param domain
+	 * @param label
+	 */
+	public UnapplyStereotypeCommand(UnapplyStereotypeRequest request, TransactionalEditingDomain domain, String label) {
+		super(domain, label, getAffectedFiles(request));
+		this.request = request;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+	 *
+	 * @param monitor
+	 * @param info
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Element element = this.request.getUmlElement();
+		Stereotype stereotype = this.request.getStereotype();
+		try {
+			element.unapplyStereotype(stereotype);
+		} catch (IllegalArgumentException e) {
+			return CommandResult.newErrorCommandResult(e);
+		}
+
+
+		return CommandResult.newOKCommandResult();
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelper.java
new file mode 100644
index 00000000000..931cbc9f6c0
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelper.java
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.edithelper;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.ApplyProfileCommand;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.ApplyStereotypeCommand;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.SetStereotypeValueCommand;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.UnapplyProfileCommand;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.UnapplyStereotypeCommand;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;
+
+public class DefaultUMLEditHelper extends DefaultEditHelper {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper#getInsteadCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param req
+	 * @return
+	 */
+	@Override
+	protected ICommand getInsteadCommand(IEditCommandRequest req) {
+
+		if (req instanceof ApplyProfileRequest) {
+			return getApplyProfileCommand((ApplyProfileRequest) req);
+		} else if (req instanceof UnapplyProfileRequest) {
+			return getUnapplyProfileCommand((UnapplyProfileRequest) req);
+		} else if (req instanceof ApplyStereotypeRequest) {
+			return getApplyStereotypeCommand((ApplyStereotypeRequest) req);
+		} else if (req instanceof UnapplyStereotypeRequest) {
+			return getUnapplyStereotypeCommand((UnapplyStereotypeRequest) req);
+		} else if (req instanceof SetStereotypeValueRequest) {
+			return getSetStereotypeValueCommand((SetStereotypeValueRequest) req);
+		}
+
+		return super.getInsteadCommand(req);
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getUnapplyProfileCommand(UnapplyProfileRequest req) {
+		return new UnapplyProfileCommand(req, req.getEditingDomain(), req.getLabel());
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getApplyProfileCommand(ApplyProfileRequest req) {
+		return new ApplyProfileCommand(req, req.getEditingDomain(), req.getLabel());
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getUnapplyStereotypeCommand(UnapplyStereotypeRequest req) {
+		return new UnapplyStereotypeCommand(req, req.getEditingDomain(), req.getLabel());
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getApplyStereotypeCommand(ApplyStereotypeRequest req) {
+		return new ApplyStereotypeCommand(req, req.getEditingDomain(), req.getLabel());
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getSetStereotypeValueCommand(SetStereotypeValueRequest req) {
+		return new SetStereotypeValueCommand(req, req.getEditingDomain(), req.getLabel());
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelperAdvice.java
new file mode 100644
index 00000000000..4d3f1a18c0f
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelperAdvice.java
@@ -0,0 +1,152 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.edithelper;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;
+
+public class DefaultUMLEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getBeforeEditCommand(IEditCommandRequest req) {
+		if (req instanceof ApplyProfileRequest) {
+			return getBeforeApplyProfileCommand((ApplyProfileRequest) req);
+		} else if (req instanceof UnapplyStereotypeRequest) {
+			return getBeforeUnapplyProfileCommand((UnapplyStereotypeRequest) req);
+		} else if (req instanceof ApplyStereotypeRequest) {
+			return getBeforeApplyStereotypeCommand((ApplyStereotypeRequest) req);
+		} else if (req instanceof UnapplyProfileRequest) {
+			return getBeforeUnapplyStereotypeCommand((UnapplyProfileRequest) req);
+		} else if (req instanceof SetStereotypeValueRequest) {
+			return getBeforeSetValueCommand((SetStereotypeValueRequest) req);
+		}
+
+		return super.getBeforeEditCommand(req);
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getAfterEditCommand(IEditCommandRequest req) {
+		if (req instanceof ApplyProfileRequest) {
+			return getAfterApplyProfileCommand((ApplyProfileRequest) req);
+		} else if (req instanceof UnapplyStereotypeRequest) {
+			return getAfterUnapplyProfileCommand((UnapplyStereotypeRequest) req);
+		} else if (req instanceof ApplyStereotypeRequest) {
+			return getAfterApplyStereotypeCommand((ApplyStereotypeRequest) req);
+		} else if (req instanceof UnapplyProfileRequest) {
+			return getAfterUnapplyStereotypeCommand((UnapplyProfileRequest) req);
+		} else if (req instanceof SetStereotypeValueRequest) {
+			return getAfterSetValueCommand((SetStereotypeValueRequest) req);
+		}
+
+		return super.getAfterEditCommand(req);
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getBeforeUnapplyProfileCommand(UnapplyStereotypeRequest req) {
+		return null;
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getBeforeApplyProfileCommand(ApplyProfileRequest req) {
+		return null;
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getBeforeUnapplyStereotypeCommand(UnapplyProfileRequest req) {
+		return null;
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getBeforeApplyStereotypeCommand(ApplyStereotypeRequest req) {
+		return null;
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getAfterUnapplyProfileCommand(UnapplyStereotypeRequest req) {
+		return null;
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getAfterApplyProfileCommand(ApplyProfileRequest req) {
+		return null;
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getAfterUnapplyStereotypeCommand(UnapplyProfileRequest req) {
+		return null;
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getAfterApplyStereotypeCommand(ApplyStereotypeRequest req) {
+		return null;
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getBeforeSetValueCommand(SetStereotypeValueRequest req) {
+		return null;
+	}
+
+	/**
+	 * @param req
+	 * @return
+	 */
+	protected ICommand getAfterSetValueCommand(SetStereotypeValueRequest req) {
+		return null;
+	}
+}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRule.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRule.java
index 1107b2498e4..9509e98a5e1 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRule.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRule.java
@@ -10,21 +10,26 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;
+import org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Profile;
 import org.eclipse.uml2.uml.Stereotype;
 
-public class InvariantStereotypeRule extends AbstractInvariantRule<InvariantStereotypeRuleConfiguration> {
+public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantStereotypeRuleConfiguration> {
 
 	/**
 	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#matches(org.eclipse.emf.ecore.EObject)
@@ -111,4 +116,78 @@ public class InvariantStereotypeRule extends AbstractInvariantRule<InvariantSter
 		return true;
 	}
 
+	/**
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveApplyStereotypeRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
+	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest)
+	 *
+	 * @param type
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected boolean approveApplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, ApplyStereotypeRequest request) {
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveUnapplyStereotypeRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
+	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest)
+	 *
+	 * @param type
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected boolean approveUnapplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, UnapplyStereotypeRequest request) {
+
+		if (request.getStereotype().getQualifiedName().equals(this.invariantRuleConfiguration.getStereotypeQualifiedName())) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveApplyProfileRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
+	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest)
+	 *
+	 * @param type
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected boolean approveApplyProfileRequest(ConfiguredHintedSpecializationElementType type, ApplyProfileRequest request) {
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveUnapplyProfileRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
+	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest)
+	 *
+	 * @param type
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected boolean approveUnapplyProfileRequest(ConfiguredHintedSpecializationElementType type, UnapplyProfileRequest request) {
+		String requiredProfileName = invariantRuleConfiguration.getRequiredProfile();
+
+		if (requiredProfileName.equals(request.getProfile().getQualifiedName())) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveSetStereotypeValueRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
+	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest)
+	 *
+	 * @param type
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected boolean approveSetStereotypeValueRequest(ConfiguredHintedSpecializationElementType type, SetStereotypeValueRequest request) {
+		return true;
+	}
+
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractProfileRequest.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractProfileRequest.java
new file mode 100644
index 00000000000..bcca470441d
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractProfileRequest.java
@@ -0,0 +1,90 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Profile;
+
+public abstract class AbstractProfileRequest extends AbstractEditCommandRequest {
+
+	private org.eclipse.uml2.uml.Package umlPackage;
+	private Profile profile;
+
+
+	public AbstractProfileRequest(TransactionalEditingDomain editingDomain, org.eclipse.uml2.uml.Package umlPackage, Profile profile) {
+		super(editingDomain);
+		this.umlPackage = umlPackage;
+		this.profile = profile;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest#getEditHelperContext()
+	 *
+	 * @return
+	 */
+	public Object getEditHelperContext() {
+		IClientContext context = getClientContext();
+
+		if (context == null) {
+			return umlPackage;
+		} else {
+			return new EditHelperContext(umlPackage, context);
+		}
+	}
+
+	/**
+	 * @return the umlPackage
+	 */
+	public org.eclipse.uml2.uml.Package getUmlPackage() {
+		return umlPackage;
+	}
+
+	/**
+	 * @param umlPackage
+	 *            the umlPackage to set
+	 */
+	public void setUmlPackage(org.eclipse.uml2.uml.Package umlPackage) {
+		this.umlPackage = umlPackage;
+	}
+
+	/**
+	 * @return the profile
+	 */
+	public Profile getProfile() {
+		return profile;
+	}
+
+	/**
+	 * @param profile
+	 *            the profile to set
+	 */
+	public void setProfile(Profile profile) {
+		this.profile = profile;
+	}
+
+	public List<Package> getElementsToEdit() {
+		if (umlPackage != null) {
+			return Collections.singletonList(umlPackage);
+		}
+
+		return Collections.emptyList();
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractStereotypeRequest.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractStereotypeRequest.java
new file mode 100644
index 00000000000..e07a1ac5f83
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractStereotypeRequest.java
@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+public abstract class AbstractStereotypeRequest extends AbstractEditCommandRequest {
+	private Element umlElement;
+	private Stereotype stereotype;
+
+	public AbstractStereotypeRequest(TransactionalEditingDomain editingDomain, Element umlElement, Stereotype stereotype) {
+		super(editingDomain);
+		this.umlElement = umlElement;
+		this.stereotype = stereotype;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest#getEditHelperContext()
+	 *
+	 * @return
+	 */
+	public Object getEditHelperContext() {
+		IClientContext context = getClientContext();
+
+		if (context == null) {
+			return umlElement;
+		} else {
+			return new EditHelperContext(umlElement, context);
+		}
+	}
+
+	/**
+	 * @return the umlElement
+	 */
+	public Element getUmlElement() {
+		return umlElement;
+	}
+
+	/**
+	 * @param umlElement
+	 *            the umlElement to set
+	 */
+	public void setUmlElement(Element umlElement) {
+		this.umlElement = umlElement;
+	}
+
+	/**
+	 * @return the stereotype
+	 */
+	public Stereotype getStereotype() {
+		return stereotype;
+	}
+
+	/**
+	 * @param stereotype
+	 *            the stereotype to set
+	 */
+	public void setStereotype(Stereotype stereotype) {
+		this.stereotype = stereotype;
+	}
+
+	public List<Element> getElementsToEdit() {
+		if (umlElement != null) {
+			return Collections.singletonList(umlElement);
+		}
+
+		return Collections.emptyList();
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyProfileRequest.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyProfileRequest.java
new file mode 100644
index 00000000000..8786934fca6
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyProfileRequest.java
@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Profile;
+
+public class ApplyProfileRequest extends AbstractProfileRequest {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param umlPackage
+	 * @param profile
+	 * @param editingDomain
+	 */
+	public ApplyProfileRequest(TransactionalEditingDomain editingDomain, Package umlPackage, Profile profile) {
+		super(editingDomain, umlPackage, profile);
+	}
+
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyStereotypeRequest.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyStereotypeRequest.java
new file mode 100644
index 00000000000..675d4fd5730
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyStereotypeRequest.java
@@ -0,0 +1,33 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+public class ApplyStereotypeRequest extends AbstractStereotypeRequest {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param umlElement
+	 * @param stereotype
+	 * @param editingDomain
+	 */
+	public ApplyStereotypeRequest(Element umlElement, Stereotype stereotype, TransactionalEditingDomain editingDomain) {
+		super(editingDomain, umlElement, stereotype);
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/SetStereotypeValueRequest.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/SetStereotypeValueRequest.java
new file mode 100644
index 00000000000..3f40328ba62
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/SetStereotypeValueRequest.java
@@ -0,0 +1,111 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+public class SetStereotypeValueRequest extends AbstractEditCommandRequest {
+
+
+	private String propertyName;
+
+	private Element umlElement;
+
+	private Stereotype stereotype;
+
+	private Object value;
+
+
+	public SetStereotypeValueRequest(TransactionalEditingDomain editingDomain, Stereotype stereotype, Element elementToEdit, String propertyName, Object value) {
+		super(editingDomain);
+		this.umlElement = elementToEdit;
+		this.propertyName = propertyName;
+		this.value = value;
+		this.stereotype = stereotype;
+	}
+
+	/**
+	 * @return the stereotype
+	 */
+	public Stereotype getStereotype() {
+		return stereotype;
+	}
+
+	/**
+	 * @param stereotype
+	 *            the stereotype to set
+	 */
+	public void setStereotype(Stereotype stereotype) {
+		this.stereotype = stereotype;
+	}
+
+	public Object getValue() {
+		return value;
+	}
+
+	/**
+	 * @param value
+	 *            the value to set
+	 */
+	public void setValue(Object value) {
+		this.value = value;
+	}
+
+	public String getPropertyName() {
+		return propertyName;
+	}
+
+	/**
+	 * @param propertyName
+	 *            the propertyName to set
+	 */
+	public void setPropertyName(String propertyName) {
+		this.propertyName = propertyName;
+	}
+
+
+	public List<Element> getElementsToEdit() {
+		if (umlElement != null) {
+			return Collections.singletonList(umlElement);
+		}
+
+		return Collections.emptyList();
+	}
+
+
+	public Object getEditHelperContext() {
+		IClientContext context = getClientContext();
+
+		if (context == null) {
+			return umlElement;
+		} else {
+			return new EditHelperContext(umlElement, context);
+		}
+	}
+
+	/**
+	 * @return the umlElement
+	 */
+	public Element getUmlElement() {
+		return umlElement;
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyProfileRequest.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyProfileRequest.java
new file mode 100644
index 00000000000..ddde7b8ca8e
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyProfileRequest.java
@@ -0,0 +1,26 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Profile;
+
+public class UnapplyProfileRequest extends AbstractProfileRequest {
+
+	public UnapplyProfileRequest(Package umlPackage, Profile profile, TransactionalEditingDomain editingDomain) {
+		super(editingDomain, umlPackage, profile);
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyStereotypeRequest.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyStereotypeRequest.java
new file mode 100644
index 00000000000..d2893c8cd1b
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyStereotypeRequest.java
@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+public class UnapplyStereotypeRequest extends AbstractStereotypeRequest {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param umlPackage
+	 * @param profile
+	 * @param editingDomain
+	 */
+	public UnapplyStereotypeRequest(Element umlElement, Stereotype stereotype, TransactionalEditingDomain editingDomain) {
+		super(editingDomain, umlElement, stereotype);
+	}
+
+
+}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceEditHelperAdvice.java
index 89da9998b29..7fd2f68de56 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceEditHelperAdvice.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration;

+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;

 

 import java.util.Arrays;

 

@@ -29,9 +29,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.Activator;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;

 import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;

-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.Activator;

-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceFactory.java
index cfcf648cd5d..12b7880e519 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceFactory.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration;

+package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;

 

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

 import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcher.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcher.java
index cf48adbc34b..d7af16b11f8 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcher.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcher.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherFactory.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherFactory.java
index 2ae92127943..dcdb4be3cba 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherFactory.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;

+package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;

 

 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

 import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IMatcherFactory;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/umlinvariantrule/AbstractUmlInvariantRule.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/umlinvariantrule/AbstractUmlInvariantRule.java
new file mode 100644
index 00000000000..2e46f4508e3
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/umlinvariantrule/AbstractUmlInvariantRule.java
@@ -0,0 +1,93 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule;

+

+import java.util.List;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;

+

+public abstract class AbstractUmlInvariantRule<T extends InvariantRuleConfiguration> extends AbstractInvariantRule<T> {

+	protected T invariantRuleConfiguration;

+

+	/**

+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

+	 *

+	 * @param request

+	 * @return

+	 */

+	@Override

+	public boolean approveRequest(IEditCommandRequest request) {

+

+		List<?> elementsToEdit = request.getElementsToEdit();

+		for (Object elementToEdit : elementsToEdit) {

+			if (elementToEdit instanceof EObject) {

+				IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) elementToEdit, request.getClientContext());

+

+				for (IElementType type : types) {

+					if (type instanceof ConfiguredHintedSpecializationElementType) {

+						ConfiguredHintedSpecializationElementType configuredHintedSpecializationElementType = (ConfiguredHintedSpecializationElementType) type;

+						if (request instanceof ApplyStereotypeRequest) {

+							if (!approveApplyStereotypeRequest(configuredHintedSpecializationElementType, (ApplyStereotypeRequest) request)) {

+								return false;

+							}

+						} else if (request instanceof UnapplyStereotypeRequest) {

+							if (!approveUnapplyStereotypeRequest(configuredHintedSpecializationElementType, (UnapplyStereotypeRequest) request)) {

+								return false;

+							}

+						} else if (request instanceof ApplyProfileRequest) {

+							if (!approveApplyProfileRequest(configuredHintedSpecializationElementType, (ApplyProfileRequest) request)) {

+								return false;

+							}

+						} else if (request instanceof UnapplyProfileRequest) {

+							if (!approveUnapplyProfileRequest(configuredHintedSpecializationElementType, (UnapplyProfileRequest) request)) {

+								return false;

+							}

+						} else if (request instanceof SetStereotypeValueRequest) {

+							if (!approveSetStereotypeValueRequest(configuredHintedSpecializationElementType, (SetStereotypeValueRequest) request)) {

+								return false;

+							}

+						}

+					}

+				}

+			}

+		}

+

+		return super.approveRequest(request);

+	}

+

+	abstract protected boolean approveApplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, ApplyStereotypeRequest request);

+

+	abstract protected boolean approveUnapplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, UnapplyStereotypeRequest request);

+

+	abstract protected boolean approveApplyProfileRequest(ConfiguredHintedSpecializationElementType type, ApplyProfileRequest request);

+

+	abstract protected boolean approveUnapplyProfileRequest(ConfiguredHintedSpecializationElementType type, UnapplyProfileRequest request);

+

+	abstract protected boolean approveSetStereotypeValueRequest(ConfiguredHintedSpecializationElementType type, SetStereotypeValueRequest request);

+

+	@Override

+	public void init(T invariantRuleConfiguration) {

+		this.invariantRuleConfiguration = invariantRuleConfiguration;

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
index 26746b21af6..bacd62b0ff4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
@@ -35,7 +35,8 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

  org.eclipse.uml2.uml;bundle-version="5.1.0",

  org.eclipse.emf.ecore;bundle-version="2.11.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ElementEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ElementEditHelper.java
index 259629c1d15..57eb0e17d26 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ElementEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ElementEditHelper.java
@@ -24,10 +24,10 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper;

 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.elementtypesconfigurations.edithelper.DefaultUMLEditHelper;

 import org.eclipse.papyrus.uml.tools.model.UmlUtils;

 import org.eclipse.uml2.uml.Element;

 

@@ -42,7 +42,7 @@ import org.eclipse.uml2.uml.Element;
  * The configure command allows contributions provided by the request parameters.

  * </pre>

  */

-public class ElementEditHelper extends DefaultEditHelper {

+public class ElementEditHelper extends DefaultUMLEditHelper {

 

 	/**

 	 * Obtains an edit command, if available, from the Papyrus Element Edit Service.

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/META-INF/MANIFEST.MF
deleted file mode 100644
index d1b86bc052f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.elementtypesconfigurations.edit;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.uml2.uml.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.swt,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.ui.workbench,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.tools.elementtypesconfigurations,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.impl,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.provider,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration.util,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.util,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.impl,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.provider,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.settypeadviceconfiguration.util,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider,

- org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.tools.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider.StereotypeApplicationMatcherConfigurationEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.elementtypesconfigurations;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeCommand.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeCommand.java
deleted file mode 100644
index 2a342587227..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeCommand.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.Activator;

-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Stereotype;

-

-public class ApplyStereotypeCommand extends AbstractTransactionalCommand {

-

-	private Stereotype stereotype;

-

-	private Element element;

-

-	private boolean rename;

-

-	/**

-	 * @param domain

-	 *            editing domain to modify the element

-	 * @param element

-	 *            the element on which stereotype is applied. Must not be <code>null</code>

-	 * @param stereotype

-	 *            the stereotype to modify

-	 * @param rename

-	 */

-	public ApplyStereotypeCommand(TransactionalEditingDomain domain, Element element, Stereotype stereotype, boolean rename) {

-		super(domain, "Apply Stereotype " + stereotype.getLabel(), getWorkspaceFiles(element));

-		this.element = element;

-		this.stereotype = stereotype;

-		this.rename = rename;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		try {

-			Object stereotypeApplication = element.applyStereotype(stereotype);

-			if (rename && element instanceof NamedElement) {

-				if (((NamedElement) element).getNamespace() != null) {

-					String newName = NamedElementUtil.getDefaultNameWithIncrementFromBase(stereotype.getName(), ((NamedElement) element).getNamespace().getMembers());

-					((NamedElement) element).setName(newName);

-				}

-			}

-			return CommandResult.newOKCommandResult(stereotypeApplication);

-		} catch (Throwable t) {

-			Activator.log.error(t);

-			return CommandResult.newErrorCommandResult(t.getMessage());

-		}

-	}

-}
\ No newline at end of file
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/SetStereotypeValueCommand.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/SetStereotypeValueCommand.java
deleted file mode 100644
index 26b5cc77b7e..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations/src/org/eclipse/papyrus/uml/tools/elementtypesconfigurations/applystereotypeadviceconfiguration/SetStereotypeValueCommand.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.elementtypesconfigurations.applystereotypeadviceconfiguration;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.Activator;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Stereotype;

-

-public class SetStereotypeValueCommand extends AbstractTransactionalCommand {

-

-	private Element element;

-	private Stereotype stereotype;

-	private String featureName;

-	private Object featureValue;

-

-	/**

-	 * Default Constructor

-	 * 

-	 * @param domain

-	 *            editing domain to modify the element

-	 * @param element

-	 *            the element on which stereotype is applied. Must not be <code>null</code>

-	 * @param stereotype

-	 *            the stereotype to modify

-	 * @param featureName

-	 *            name of the stereotype feature to modify

-	 * @param featureValue

-	 *            the new value for the stereotype feature value

-	 */

-	public SetStereotypeValueCommand(TransactionalEditingDomain domain, Element element, Stereotype stereotype, String featureName, Object featureValue) {

-		super(domain, "Set stereotype  value " + featureName, getWorkspaceFiles(element.getStereotypeApplication(stereotype)));

-		this.element = element;

-		this.stereotype = stereotype;

-		this.featureName = featureName;

-		this.featureValue = featureValue;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		try {

-			element.setValue(stereotype, featureName, featureValue);

-		} catch (Throwable t) {

-			Activator.log.error(t);

-			return CommandResult.newErrorCommandResult(t.getMessage());

-		}

-

-		return CommandResult.newOKCommandResult(element.getValue(stereotype, featureName));

-	}

-

-}
\ No newline at end of file