400801: [Table 2] Tabular Editor must allow to create new element and add it to the table

https://bugs.eclipse.org/bugs/show_bug.cgi?id=400801

250 files changed, 352 insertions, 319 deletions

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
index b70f39a8466..2ec209f1505 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
@@ -19,8 +19,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
  org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
  org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
+ org.eclipse.uml2.uml
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.uml.nattable.menu,
- org.eclipse.papyrus.uml.nattable.menu.handlers
+ org.eclipse.papyrus.uml.nattable.menu.handlers,
+ org.eclipse.papyrus.uml.nattable.menu.messages,
+ org.eclipse.papyrus.uml.nattable.menu.tester,
+ org.eclipse.papyrus.uml.nattable.menu.util
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.xml
index 4aa85441b6d..4c073703c74 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.xml
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.xml
@@ -3,8 +3,7 @@
 <plugin>

 

 <extension point= "org.eclipse.ui.handlers">

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AbstractionHandler" commandId="org.eclipse.papyrus.uml.service.types.AbstractionCreateCommand">

-   </handler>

+<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AbstractionHandler" commandId="org.eclipse.papyrus.uml.service.types.AbstractionCreateCommand"></handler>

 <handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AcceptCallActionHandler" commandId="org.eclipse.papyrus.uml.service.types.AcceptCallActionCreateCommand"></handler>

 <handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AcceptEventActionHandler" commandId="org.eclipse.papyrus.uml.service.types.AcceptEventActionCreateCommand"></handler>

 <handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActionExecutionSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.ActionExecutionSpecificationCreateCommand"></handler>

@@ -273,7 +272,7 @@
    </menuContribution>

       <menuContribution

             allPopups="false"

-            class="org.eclipse.papyrus.uml.nattable.menu.handlers.UMLNattableCreateMenu"

+            class="org.eclipse.papyrus.uml.nattable.menu.handlers.UmlNattableCreateMenu"

             locationURI="popup:org.eclipse.papyrus.uml.nattable.create.uml.menu">

       </menuContribution>

       

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractionHandler.java
index e65aec40e7b..a26f76c9d45 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class AbstractionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class AbstractionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptCallActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptCallActionHandler.java
index f7e6a384dc9..55e12b23ac8 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptCallActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptCallActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class AcceptCallActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class AcceptCallActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptEventActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptEventActionHandler.java
index d82b202c9e3..6f19ad01006 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptEventActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptEventActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class AcceptEventActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class AcceptEventActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionExecutionSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionExecutionSpecificationHandler.java
index 5f12e75013d..c88ac13f2a6 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionExecutionSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionExecutionSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActionExecutionSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActionExecutionSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionHandler.java
index 6daa10ea50d..974fdbd4e1e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionInputPinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionInputPinHandler.java
index 4bef036376d..03b4e3335ec 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionInputPinHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionInputPinHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActionInputPinHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActionInputPinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityEdgeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityEdgeHandler.java
index 237604bb548..091c705c21d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityEdgeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityEdgeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActivityEdgeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActivityEdgeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityFinalNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityFinalNodeHandler.java
index 3c6d092f931..6496f17b1e2 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityFinalNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityFinalNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActivityFinalNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActivityFinalNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityGroupHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityGroupHandler.java
index e56819dcfd0..4c8b59829d7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityGroupHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityGroupHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActivityGroupHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActivityGroupHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityHandler.java
index 7d7b7c13848..e51d0e73b05 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActivityHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActivityHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityNodeHandler.java
index 98c20f56bf3..e9602b2d44d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActivityNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActivityNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityParameterNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityParameterNodeHandler.java
index 0b7bffedd1c..7f2f6088d03 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityParameterNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityParameterNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActivityParameterNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActivityParameterNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityPartitionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityPartitionHandler.java
index 37afb7d2a20..c36579662c3 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityPartitionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityPartitionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActivityPartitionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActivityPartitionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActorHandler.java
index 6bc8082e25d..5d5c7aa423a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActorHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActorHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ActorHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ActorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddStructuralFeatureValueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddStructuralFeatureValueActionHandler.java
index b8d12e40cc2..97baea42f24 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddStructuralFeatureValueActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddStructuralFeatureValueActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class AddStructuralFeatureValueActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class AddStructuralFeatureValueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddVariableValueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddVariableValueActionHandler.java
index c02876bfbdf..0aa07fda815 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddVariableValueActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddVariableValueActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class AddVariableValueActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class AddVariableValueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AnyReceiveEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AnyReceiveEventHandler.java
index 77405980e8e..0d267b66efe 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AnyReceiveEventHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AnyReceiveEventHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class AnyReceiveEventHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class AnyReceiveEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ArtifactHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ArtifactHandler.java
index 13baa89e849..47645cfcddc 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ArtifactHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ArtifactHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ArtifactHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ArtifactHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationBaseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationBaseHandler.java
index e3317267581..36c500ba472 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationBaseHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationBaseHandler.java
@@ -23,11 +23,11 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class AssociationBaseHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class AssociationBaseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
+	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
 	 * 
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationClassHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationClassHandler.java
index 75d13ff32a6..ee8684ccc3e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationClassHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationClassHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class AssociationClassHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class AssociationClassHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationHandler.java
index eee5c9f1eb6..8c88877a4c7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class AssociationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class AssociationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorExecutionSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorExecutionSpecificationHandler.java
index b07f0016b4c..aee4704ebc5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorExecutionSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorExecutionSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class BehaviorExecutionSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class BehaviorExecutionSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorHandler.java
index 6cfea2b87e2..d4ed8e3e563 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class BehaviorHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class BehaviorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioralFeatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioralFeatureHandler.java
index c6429df5209..2489e48d16d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioralFeatureHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioralFeatureHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class BehavioralFeatureHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class BehavioralFeatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioredClassifierHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioredClassifierHandler.java
index 3f32cf5285d..9576dd9979d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioredClassifierHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioredClassifierHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class BehavioredClassifierHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class BehavioredClassifierHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BroadcastSignalActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BroadcastSignalActionHandler.java
index 5a4c91d04ff..8ddd55f76a5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BroadcastSignalActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BroadcastSignalActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class BroadcastSignalActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class BroadcastSignalActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallActionHandler.java
index 5e4eacb15ce..486a822eb4d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CallActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CallActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallBehaviorActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallBehaviorActionHandler.java
index 03fe291aebb..af87a91b44b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallBehaviorActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallBehaviorActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CallBehaviorActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CallBehaviorActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallEventHandler.java
index d5cabe0942b..6c9d1d9fa1e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallEventHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallEventHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CallEventHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CallEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallOperationActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallOperationActionHandler.java
index c6386be463a..97beaf6e0d2 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallOperationActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallOperationActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CallOperationActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CallOperationActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CentralBufferNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CentralBufferNodeHandler.java
index efb85edddb3..9ac3c2e4a8d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CentralBufferNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CentralBufferNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CentralBufferNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CentralBufferNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ChangeEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ChangeEventHandler.java
index e3840f719c1..52bab844476 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ChangeEventHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ChangeEventHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ChangeEventHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ChangeEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassHandler.java
index 92a89d13f08..b6bbad4627b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ClassHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ClassHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierHandler.java
index bd34c792c8d..287cc030d88 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ClassifierHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ClassifierHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierTemplateParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierTemplateParameterHandler.java
index ca063621758..3dd4951a232 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierTemplateParameterHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierTemplateParameterHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ClassifierTemplateParameterHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ClassifierTemplateParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClauseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClauseHandler.java
index 1434c5ad301..ddfd90b28ca 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClauseHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClauseHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ClauseHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ClauseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearAssociationActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearAssociationActionHandler.java
index 4c5cf277396..12d5e61ab18 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearAssociationActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearAssociationActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ClearAssociationActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ClearAssociationActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearStructuralFeatureActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearStructuralFeatureActionHandler.java
index 65edb213b9f..7e12bf1df88 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearStructuralFeatureActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearStructuralFeatureActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ClearStructuralFeatureActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ClearStructuralFeatureActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearVariableActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearVariableActionHandler.java
index 3e52cfec21a..08e62590238 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearVariableActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearVariableActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ClearVariableActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ClearVariableActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationHandler.java
index ab327847dce..0686f2c6013 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CollaborationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CollaborationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationUseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationUseHandler.java
index b9150115635..84592b1c35d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationUseHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationUseHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CollaborationUseHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CollaborationUseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CombinedFragmentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CombinedFragmentHandler.java
index 742214e9d38..7344d7b5138 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CombinedFragmentHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CombinedFragmentHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CombinedFragmentHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CombinedFragmentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommentHandler.java
index 22cfad138a9..885a6511fb4 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommentHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommentHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CommentHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CommentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommunicationPathHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommunicationPathHandler.java
index bb27da1b744..44a0175335a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommunicationPathHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommunicationPathHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CommunicationPathHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CommunicationPathHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentHandler.java
index e84566bbbc6..3158391ce5f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ComponentHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ComponentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentRealizationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentRealizationHandler.java
index 452b064c0cc..ca086f300a1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentRealizationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentRealizationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ComponentRealizationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ComponentRealizationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConditionalNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConditionalNodeHandler.java
index 7292dbdcd06..02d00b75f83 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConditionalNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConditionalNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ConditionalNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ConditionalNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementHandler.java
index bdc32ffd8ea..ba9f6cd97c6 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ConnectableElementHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ConnectableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementTemplateParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementTemplateParameterHandler.java
index 85cb5bc9eb1..e5561f9a3e5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementTemplateParameterHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementTemplateParameterHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ConnectableElementTemplateParameterHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ConnectableElementTemplateParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectionPointReferenceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectionPointReferenceHandler.java
index 94241d62c24..34aab1aec25 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectionPointReferenceHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectionPointReferenceHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ConnectionPointReferenceHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ConnectionPointReferenceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorEndHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorEndHandler.java
index bc218c10454..5b49b7d0c9d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorEndHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorEndHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ConnectorEndHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ConnectorEndHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorHandler.java
index 655f79e6b24..5d4db811e9d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ConnectorHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ConnectorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConsiderIgnoreFragmentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConsiderIgnoreFragmentHandler.java
index 9a64cdd00c4..7dc8563e229 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConsiderIgnoreFragmentHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConsiderIgnoreFragmentHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ConsiderIgnoreFragmentHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ConsiderIgnoreFragmentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConstraintHandler.java
index 6414340ef21..6bddc8e20e3 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConstraintHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConstraintHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ConstraintHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ContinuationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ContinuationHandler.java
index f29e1450e7a..777534d58f7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ContinuationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ContinuationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ContinuationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ContinuationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlFlowHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlFlowHandler.java
index 0ac134d0a9b..b737cb12dfe 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlFlowHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlFlowHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ControlFlowHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ControlFlowHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlNodeHandler.java
index bb71aa5f119..11df00389fa 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ControlNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ControlNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkActionHandler.java
index b997ea8a379..4b986dce62b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CreateLinkActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CreateLinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkObjectActionHandler.java
index b45b9755d66..3325e7e59cf 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkObjectActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkObjectActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CreateLinkObjectActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CreateLinkObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateObjectActionHandler.java
index 9043da16faf..87c213de096 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateObjectActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateObjectActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class CreateObjectActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class CreateObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataStoreNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataStoreNodeHandler.java
index 1a71de27b73..2af09f3651b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataStoreNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataStoreNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DataStoreNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DataStoreNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataTypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataTypeHandler.java
index 984a78d6651..04cbd9f53d0 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataTypeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataTypeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DataTypeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DataTypeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DecisionNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DecisionNodeHandler.java
index a9d73563481..fc894d52899 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DecisionNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DecisionNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DecisionNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DecisionNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DependencyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DependencyHandler.java
index f38b3616b05..225434ed075 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DependencyHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DependencyHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DependencyHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DependencyHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeployedArtifactHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeployedArtifactHandler.java
index 628a66ffa1a..b7a147c946f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeployedArtifactHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeployedArtifactHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DeployedArtifactHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DeployedArtifactHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentHandler.java
index 89bee51f247..3942619e527 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DeploymentHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DeploymentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentSpecificationHandler.java
index 6f99cbd2e1e..e84a679c883 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DeploymentSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DeploymentSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentTargetHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentTargetHandler.java
index b7d2c2ec5e4..5011644fd46 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentTargetHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentTargetHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DeploymentTargetHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DeploymentTargetHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyLinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyLinkActionHandler.java
index 4db3e553826..3acb2662764 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyLinkActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyLinkActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DestroyLinkActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DestroyLinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyObjectActionHandler.java
index 42cdd637b28..b3f615b9f1d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyObjectActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyObjectActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DestroyObjectActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DestroyObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestructionOccurrenceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestructionOccurrenceSpecificationHandler.java
index 7ddb08cae88..a3bdf4f2f50 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestructionOccurrenceSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestructionOccurrenceSpecificationHandler.java
@@ -23,11 +23,11 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DestructionOccurrenceSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DestructionOccurrenceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
+	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
 	 * 
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeviceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeviceHandler.java
index 18f74787536..d41cb7cfb07 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeviceHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeviceHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DeviceHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DeviceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DirectedRelationshipHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DirectedRelationshipHandler.java
index 6eeb118a3df..106ad97fac3 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DirectedRelationshipHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DirectedRelationshipHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DirectedRelationshipHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DirectedRelationshipHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationConstraintHandler.java
index bde26019bb1..e750990f2e8 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationConstraintHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationConstraintHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DurationConstraintHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DurationConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationHandler.java
index e08f0e9b90c..c7cd870b8f9 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DurationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DurationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationIntervalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationIntervalHandler.java
index fb43e3477fd..3c9641df5f4 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationIntervalHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationIntervalHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DurationIntervalHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DurationIntervalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationObservationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationObservationHandler.java
index 8f1545bde56..dd090eca5a7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationObservationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationObservationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class DurationObservationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class DurationObservationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementHandler.java
index f8ed2f8bdce..2c29fbfefff 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ElementHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementImportHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementImportHandler.java
index a0c56abfd26..c8525f50c24 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementImportHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementImportHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ElementImportHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ElementImportHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EncapsulatedClassifierHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EncapsulatedClassifierHandler.java
index 3c65c4f723b..9447a1532ff 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EncapsulatedClassifierHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EncapsulatedClassifierHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class EncapsulatedClassifierHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class EncapsulatedClassifierHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationHandler.java
index 4f30e8ca17d..6115798ede0 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class EnumerationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class EnumerationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationLiteralHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationLiteralHandler.java
index 07e7578b49d..c8ec63e356d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationLiteralHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationLiteralHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class EnumerationLiteralHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class EnumerationLiteralHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EventHandler.java
index 9e62302b126..d33e9ce173e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EventHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EventHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class EventHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class EventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExceptionHandlerHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExceptionHandlerHandler.java
index 78f465f0a9c..4faaa3b553f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExceptionHandlerHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExceptionHandlerHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExceptionHandlerHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExceptionHandlerHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutableNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutableNodeHandler.java
index 282d8b445c6..737e4b42992 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutableNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutableNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExecutableNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExecutableNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionEnvironmentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionEnvironmentHandler.java
index 62349c732ff..87ea7edf2d3 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionEnvironmentHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionEnvironmentHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExecutionEnvironmentHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExecutionEnvironmentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionOccurrenceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionOccurrenceSpecificationHandler.java
index d728e45bcde..b4a6864e879 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionOccurrenceSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionOccurrenceSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExecutionOccurrenceSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExecutionOccurrenceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionSpecificationHandler.java
index 05567875e15..ceb126c3d2b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExecutionSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExecutionSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionNodeHandler.java
index 043e31c29f5..f5e703d3889 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExpansionNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExpansionNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionRegionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionRegionHandler.java
index 305dff4fd57..16779ceaf3b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionRegionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionRegionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExpansionRegionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExpansionRegionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpressionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpressionHandler.java
index 6f91c2f23f2..338e6a0829d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpressionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpressionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExpressionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExpressionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtendHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtendHandler.java
index 4c7596d7fa8..2ac3c127f06 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtendHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtendHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExtendHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExtendHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionEndHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionEndHandler.java
index 3ef6bebfe61..890b8c54a61 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionEndHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionEndHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExtensionEndHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExtensionEndHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionHandler.java
index b4fad21812b..2e85ce8b666 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExtensionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExtensionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionPointHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionPointHandler.java
index 6dadc4201bf..ba273cb5cbf 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionPointHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionPointHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ExtensionPointHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ExtensionPointHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FeatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FeatureHandler.java
index 9972656709f..4969651aec3 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FeatureHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FeatureHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class FeatureHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class FeatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalNodeHandler.java
index 0137ffd3a99..c37e4455b4f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class FinalNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class FinalNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalStateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalStateHandler.java
index 5891cd5c7ea..7bbd45127d9 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalStateHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalStateHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class FinalStateHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class FinalStateHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FlowFinalNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FlowFinalNodeHandler.java
index 5cd8de81bbb..d003472b797 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FlowFinalNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FlowFinalNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class FlowFinalNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class FlowFinalNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ForkNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ForkNodeHandler.java
index 3a1afd392d4..2a23878ee43 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ForkNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ForkNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ForkNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ForkNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FunctionBehaviorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FunctionBehaviorHandler.java
index c879bd6b424..052aab6a1c1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FunctionBehaviorHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FunctionBehaviorHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class FunctionBehaviorHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class FunctionBehaviorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GateHandler.java
index 4e360ad55eb..ec29ac67148 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GateHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GateHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class GateHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class GateHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralOrderingHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralOrderingHandler.java
index ff445f32d63..d0990fc086b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralOrderingHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralOrderingHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class GeneralOrderingHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class GeneralOrderingHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationHandler.java
index bf167221ccd..3b0ff50636c 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class GeneralizationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class GeneralizationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationSetHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationSetHandler.java
index 70f830757b7..fed19d32fb5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationSetHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationSetHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class GeneralizationSetHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class GeneralizationSetHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ImageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ImageHandler.java
index ea6cb72bdba..db7f42018c2 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ImageHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ImageHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ImageHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ImageHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IncludeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IncludeHandler.java
index fa7e89aa532..21d4123c92b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IncludeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IncludeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class IncludeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class IncludeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationFlowHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationFlowHandler.java
index 4829e4a6ac4..3b0bad3af5b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationFlowHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationFlowHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InformationFlowHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InformationFlowHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationItemHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationItemHandler.java
index a2672aa7e64..50563988ef0 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationItemHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationItemHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InformationItemHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InformationItemHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InitialNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InitialNodeHandler.java
index 635712ab5dd..fde0afc9726 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InitialNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InitialNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InitialNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InitialNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InputPinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InputPinHandler.java
index 4434093c3e0..58e4c541a4b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InputPinHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InputPinHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InputPinHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InputPinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceSpecificationHandler.java
index 20fb99a0e3b..df208a26a40 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InstanceSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InstanceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceValueHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceValueHandler.java
index 36aac36178c..2a3745322f3 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceValueHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceValueHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InstanceValueHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InstanceValueHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionConstraintHandler.java
index b7d8f23aa4d..33f16d30d8e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionConstraintHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionConstraintHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InteractionConstraintHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InteractionConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionFragmentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionFragmentHandler.java
index e7f7cf7acfa..5e5addb1654 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionFragmentHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionFragmentHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InteractionFragmentHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InteractionFragmentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionHandler.java
index 627a3a4be2a..c952cab95c2 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InteractionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InteractionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionOperandHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionOperandHandler.java
index 2df93af95e6..af20a4d9a12 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionOperandHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionOperandHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InteractionOperandHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InteractionOperandHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionUseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionUseHandler.java
index c6bd6eee105..2800ad84dbd 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionUseHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionUseHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InteractionUseHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InteractionUseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceHandler.java
index f5112d933cf..bddfc9ffeef 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InterfaceHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InterfaceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceRealizationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceRealizationHandler.java
index 0d1f62291a5..7eb8155b134 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceRealizationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceRealizationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InterfaceRealizationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InterfaceRealizationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterruptibleActivityRegionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterruptibleActivityRegionHandler.java
index 174393b6340..1f2a14b72ca 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterruptibleActivityRegionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterruptibleActivityRegionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InterruptibleActivityRegionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InterruptibleActivityRegionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalConstraintHandler.java
index a2a3a18c67d..251f9d3b4f6 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalConstraintHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalConstraintHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class IntervalConstraintHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class IntervalConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalHandler.java
index 9973d06cc7b..689215b910a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class IntervalHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class IntervalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InvocationActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InvocationActionHandler.java
index 671feb80f2c..75ca43dc90e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InvocationActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InvocationActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class InvocationActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class InvocationActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/JoinNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/JoinNodeHandler.java
index fc0142d9ad9..8baa7b1ff95 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/JoinNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/JoinNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class JoinNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class JoinNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LifelineHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LifelineHandler.java
index ca02469c590..0bd5e02fbe6 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LifelineHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LifelineHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LifelineHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LifelineHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkActionHandler.java
index 92b3803644b..59aa7f968dd 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LinkActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndCreationDataHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndCreationDataHandler.java
index 55220f54455..ee4bf701e14 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndCreationDataHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndCreationDataHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LinkEndCreationDataHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LinkEndCreationDataHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDataHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDataHandler.java
index c8f12dbf573..08e9ce3963d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDataHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDataHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LinkEndDataHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LinkEndDataHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDestructionDataHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDestructionDataHandler.java
index 78e050acfe8..6c9b28273df 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDestructionDataHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDestructionDataHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LinkEndDestructionDataHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LinkEndDestructionDataHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralBooleanHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralBooleanHandler.java
index a2a3800ed4e..2c20b12f876 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralBooleanHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralBooleanHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LiteralBooleanHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LiteralBooleanHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralIntegerHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralIntegerHandler.java
index 09091c9fa5e..e621b59cc9a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralIntegerHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralIntegerHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LiteralIntegerHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LiteralIntegerHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralNullHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralNullHandler.java
index f1940f160ea..66ebe3354c1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralNullHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralNullHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LiteralNullHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LiteralNullHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralRealHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralRealHandler.java
index 89bf724579b..60b0cf37e94 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralRealHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralRealHandler.java
@@ -23,11 +23,11 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LiteralRealHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LiteralRealHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
+	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
 	 * 
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralSpecificationHandler.java
index 497c9bb0c2e..49c7ae2fc40 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LiteralSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LiteralSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralStringHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralStringHandler.java
index 08897169487..f1175ca5505 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralStringHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralStringHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LiteralStringHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LiteralStringHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralUnlimitedNaturalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralUnlimitedNaturalHandler.java
index dedb1440cbe..6adde8b2422 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralUnlimitedNaturalHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralUnlimitedNaturalHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LiteralUnlimitedNaturalHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LiteralUnlimitedNaturalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LoopNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LoopNodeHandler.java
index 6cf618e3ef7..c37f341a7ea 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LoopNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LoopNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class LoopNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class LoopNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ManifestationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ManifestationHandler.java
index 5771a76374b..d1cd7348242 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ManifestationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ManifestationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ManifestationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ManifestationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MergeNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MergeNodeHandler.java
index f2805f77f81..25a8ea72dd7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MergeNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MergeNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class MergeNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class MergeNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEndHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEndHandler.java
index 0a6b33d2ffa..5b952e84b61 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEndHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEndHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class MessageEndHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class MessageEndHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEventHandler.java
index 938a4de8729..c670f292b38 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEventHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEventHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class MessageEventHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class MessageEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageHandler.java
index 37ea3b7a3b7..e258b06d960 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class MessageHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class MessageHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageOccurrenceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageOccurrenceSpecificationHandler.java
index 35c19f15c7a..fb15cad9dd7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageOccurrenceSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageOccurrenceSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class MessageOccurrenceSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class MessageOccurrenceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ModelHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ModelHandler.java
index eb29509deda..2d8527a6e16 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ModelHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ModelHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ModelHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ModelHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MultiplicityElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MultiplicityElementHandler.java
index 9d90a444cad..0e0fa939de8 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MultiplicityElementHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MultiplicityElementHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class MultiplicityElementHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class MultiplicityElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamedElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamedElementHandler.java
index 09c86c92a86..cee5297a0e0 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamedElementHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamedElementHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class NamedElementHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class NamedElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamespaceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamespaceHandler.java
index 176c568f1cd..486c8429ee1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamespaceHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamespaceHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class NamespaceHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class NamespaceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NodeHandler.java
index 479226a2833..9f61e5cf2be 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class NodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class NodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectFlowHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectFlowHandler.java
index 945914fc9c9..f18c8907a01 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectFlowHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectFlowHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ObjectFlowHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ObjectFlowHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectNodeHandler.java
index 20debbb51ac..ae76040bcbd 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ObjectNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ObjectNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObservationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObservationHandler.java
index 989b8c809b1..795f7331a81 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObservationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObservationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ObservationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ObservationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OccurrenceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OccurrenceSpecificationHandler.java
index 988c564151b..4e64f1c4520 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OccurrenceSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OccurrenceSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class OccurrenceSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class OccurrenceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueActionHandler.java
index 0c1c31b2025..f83b2705bc5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class OpaqueActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class OpaqueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueBehaviorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueBehaviorHandler.java
index 0f8e7690991..405f2317b0d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueBehaviorHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueBehaviorHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class OpaqueBehaviorHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class OpaqueBehaviorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueExpressionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueExpressionHandler.java
index e46cb1f1040..f6992526b3a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueExpressionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueExpressionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class OpaqueExpressionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class OpaqueExpressionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationHandler.java
index 7de20f61170..5a46b616b06 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class OperationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class OperationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationTemplateParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationTemplateParameterHandler.java
index 276e55cb58d..be1f6208af3 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationTemplateParameterHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationTemplateParameterHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class OperationTemplateParameterHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class OperationTemplateParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OutputPinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OutputPinHandler.java
index 9d9d73c2bfb..3963295dfec 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OutputPinHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OutputPinHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class OutputPinHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class OutputPinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageHandler.java
index 03778f775ef..dae133c75ab 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PackageHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PackageHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageImportHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageImportHandler.java
index 170fe3cf205..2c3c67562e6 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageImportHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageImportHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PackageImportHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PackageImportHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageMergeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageMergeHandler.java
index 791a8b4e52f..febf1a9af51 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageMergeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageMergeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PackageMergeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PackageMergeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageableElementHandler.java
index 4469d9c7198..13a5d0967c5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageableElementHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageableElementHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PackageableElementHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PackageableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterHandler.java
index 954053de555..598be284b8d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ParameterHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterSetHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterSetHandler.java
index 140144a9320..e1b8f70a45c 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterSetHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterSetHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ParameterSetHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ParameterSetHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterableElementHandler.java
index e4cd2488f3f..6a789ee6df7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterableElementHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterableElementHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ParameterableElementHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ParameterableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PartDecompositionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PartDecompositionHandler.java
index c1b6f42810a..b0aa617313e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PartDecompositionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PartDecompositionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PartDecompositionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PartDecompositionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PinHandler.java
index fd54e88d6d6..46b0496e5fc 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PinHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PinHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PinHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PortHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PortHandler.java
index 81711d23380..124dfe72e1e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PortHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PortHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PortHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PortHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PrimitiveTypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PrimitiveTypeHandler.java
index 10bb70bc1d2..3c2f12ab0dc 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PrimitiveTypeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PrimitiveTypeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PrimitiveTypeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PrimitiveTypeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileApplicationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileApplicationHandler.java
index 39a00436947..5c502b08c58 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileApplicationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileApplicationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ProfileApplicationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ProfileApplicationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileHandler.java
index 124d58cc72b..b0da15c8d57 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ProfileHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ProfileHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PropertyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PropertyHandler.java
index cc0f38b7cb3..8864beddfa5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PropertyHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PropertyHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PropertyHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PropertyHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolConformanceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolConformanceHandler.java
index 55830b4a8e1..f9c7ce3453b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolConformanceHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolConformanceHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ProtocolConformanceHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ProtocolConformanceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolStateMachineHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolStateMachineHandler.java
index 836c05f1a0b..4a7c4301da0 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolStateMachineHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolStateMachineHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ProtocolStateMachineHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ProtocolStateMachineHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolTransitionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolTransitionHandler.java
index f7c9bec7c54..f3e718101b7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolTransitionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolTransitionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ProtocolTransitionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ProtocolTransitionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PseudostateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PseudostateHandler.java
index 8d34612d1be..8aa2ba95223 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PseudostateHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PseudostateHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class PseudostateHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class PseudostateHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/QualifierValueHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/QualifierValueHandler.java
index 53d09c91051..7607adba6aa 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/QualifierValueHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/QualifierValueHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class QualifierValueHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class QualifierValueHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RaiseExceptionActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RaiseExceptionActionHandler.java
index 1c889e57fad..2605b3838fb 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RaiseExceptionActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RaiseExceptionActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class RaiseExceptionActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class RaiseExceptionActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadExtentActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadExtentActionHandler.java
index 6141bdc020f..ff4cace9138 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadExtentActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadExtentActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReadExtentActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReadExtentActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadIsClassifiedObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadIsClassifiedObjectActionHandler.java
index be6d66a5f76..334d6c72376 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadIsClassifiedObjectActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadIsClassifiedObjectActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReadIsClassifiedObjectActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReadIsClassifiedObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkActionHandler.java
index 9e0d10bdaf7..8472b9c9439 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReadLinkActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReadLinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndActionHandler.java
index 6b8cfe90a7c..fdcbde449d5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReadLinkObjectEndActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReadLinkObjectEndActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndQualifierActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndQualifierActionHandler.java
index d6f9d163701..729bdaad896 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndQualifierActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndQualifierActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReadLinkObjectEndQualifierActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReadLinkObjectEndQualifierActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadSelfActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadSelfActionHandler.java
index 1ce84ced1df..fe8b2fef16e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadSelfActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadSelfActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReadSelfActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReadSelfActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadStructuralFeatureActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadStructuralFeatureActionHandler.java
index 108dd8f748f..ea41da9a212 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadStructuralFeatureActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadStructuralFeatureActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReadStructuralFeatureActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReadStructuralFeatureActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadVariableActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadVariableActionHandler.java
index ba0e4fea019..3a6a9ab2c09 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadVariableActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadVariableActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReadVariableActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReadVariableActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RealizationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RealizationHandler.java
index 7ac3a3343e6..91742e47601 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RealizationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RealizationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class RealizationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class RealizationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReceptionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReceptionHandler.java
index b8f0c504e8e..d3af82695d5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReceptionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReceptionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReceptionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReceptionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReclassifyObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReclassifyObjectActionHandler.java
index 977b0d13731..d8ea22e9801 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReclassifyObjectActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReclassifyObjectActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReclassifyObjectActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReclassifyObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableElementHandler.java
index 654012b5767..7fc724dbb22 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableElementHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableElementHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class RedefinableElementHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class RedefinableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableTemplateSignatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableTemplateSignatureHandler.java
index 56278c43084..0bf2512f29e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableTemplateSignatureHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableTemplateSignatureHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class RedefinableTemplateSignatureHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class RedefinableTemplateSignatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReduceActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReduceActionHandler.java
index 4a2390e7578..60c06967666 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReduceActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReduceActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReduceActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReduceActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RefineHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RefineHandler.java
index d4335f52c8b..90fdda4e640 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RefineHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RefineHandler.java
@@ -23,11 +23,11 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class RefineHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class RefineHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
+	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
 	 * 
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RegionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RegionHandler.java
index 676c45ae3f8..bd63d17ac1a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RegionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RegionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class RegionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class RegionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RelationshipHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RelationshipHandler.java
index a60c7e01bdd..fe219040908 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RelationshipHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RelationshipHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class RelationshipHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class RelationshipHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveStructuralFeatureValueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveStructuralFeatureValueActionHandler.java
index a5db52fa2e3..4bcdeef236d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveStructuralFeatureValueActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveStructuralFeatureValueActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class RemoveStructuralFeatureValueActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class RemoveStructuralFeatureValueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveVariableValueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveVariableValueActionHandler.java
index 6456fdcde2a..f8700890809 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveVariableValueActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveVariableValueActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class RemoveVariableValueActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class RemoveVariableValueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReplyActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReplyActionHandler.java
index 74a4b61c251..4cf4ed13e2d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReplyActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReplyActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ReplyActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ReplyActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendObjectActionHandler.java
index 0d0212bace5..be69e7959ec 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendObjectActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendObjectActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class SendObjectActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class SendObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendSignalActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendSignalActionHandler.java
index f662b29cc78..f00b9d345a7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendSignalActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendSignalActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class SendSignalActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class SendSignalActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SequenceNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SequenceNodeHandler.java
index a386782c643..0a8f2f96446 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SequenceNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SequenceNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class SequenceNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class SequenceNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalEventHandler.java
index 1ff94870840..72bfe93b5cd 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalEventHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalEventHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class SignalEventHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class SignalEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalHandler.java
index 3921562d44e..6deeba14722 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class SignalHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class SignalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SlotHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SlotHandler.java
index 0a85d64646f..fb550b9c4b1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SlotHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SlotHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class SlotHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class SlotHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartClassifierBehaviorActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartClassifierBehaviorActionHandler.java
index 167da5b871e..b8174914f3a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartClassifierBehaviorActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartClassifierBehaviorActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StartClassifierBehaviorActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StartClassifierBehaviorActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartObjectBehaviorActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartObjectBehaviorActionHandler.java
index 3efe3089f98..1e815cdc4b0 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartObjectBehaviorActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartObjectBehaviorActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StartObjectBehaviorActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StartObjectBehaviorActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateHandler.java
index 78a7ba79ca4..cffe35039c1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StateHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StateHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateInvariantHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateInvariantHandler.java
index bac4a7a9b3a..b33e244bdae 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateInvariantHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateInvariantHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StateInvariantHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StateInvariantHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateMachineHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateMachineHandler.java
index b582c9923ba..72dd5a5821b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateMachineHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateMachineHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StateMachineHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StateMachineHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StereotypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StereotypeHandler.java
index 68b8dfadee3..cfc4a476ffd 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StereotypeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StereotypeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StereotypeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StereotypeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StringExpressionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StringExpressionHandler.java
index 501d99cc820..a21c45fad92 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StringExpressionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StringExpressionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StringExpressionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StringExpressionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureActionHandler.java
index 415991c2159..649019b45de 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StructuralFeatureActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StructuralFeatureActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureHandler.java
index 4acf96a7802..dec65e49fb4 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StructuralFeatureHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StructuralFeatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredActivityNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredActivityNodeHandler.java
index b0d95ccb641..21b440519e8 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredActivityNodeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredActivityNodeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StructuredActivityNodeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StructuredActivityNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredClassifierHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredClassifierHandler.java
index f0c346dafa0..4a8ca31cf2b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredClassifierHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredClassifierHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class StructuredClassifierHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class StructuredClassifierHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SubstitutionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SubstitutionHandler.java
index d58ff579d2f..5d8f123e0ec 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SubstitutionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SubstitutionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class SubstitutionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class SubstitutionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateBindingHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateBindingHandler.java
index be178ccc5fc..def0a7bd420 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateBindingHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateBindingHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TemplateBindingHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TemplateBindingHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterHandler.java
index 1ff5f6d8fb0..9c0a524f20b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TemplateParameterHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TemplateParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterSubstitutionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterSubstitutionHandler.java
index 34089d07298..01393621643 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterSubstitutionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterSubstitutionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TemplateParameterSubstitutionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TemplateParameterSubstitutionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateSignatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateSignatureHandler.java
index fd4b93a4c46..ab76e905c1a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateSignatureHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateSignatureHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TemplateSignatureHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TemplateSignatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateableElementHandler.java
index 0f97129b47b..170057eee1d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateableElementHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateableElementHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TemplateableElementHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TemplateableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TestIdentityActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TestIdentityActionHandler.java
index c1515909cd0..f46e95e9c06 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TestIdentityActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TestIdentityActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TestIdentityActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TestIdentityActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeConstraintHandler.java
index 82887fac2ad..95c260831a2 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeConstraintHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeConstraintHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TimeConstraintHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TimeConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeEventHandler.java
index 568419263e5..810a9772604 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeEventHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeEventHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TimeEventHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TimeEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeExpressionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeExpressionHandler.java
index 55589532d79..8aa0f4cb1a1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeExpressionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeExpressionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TimeExpressionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TimeExpressionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeIntervalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeIntervalHandler.java
index 6c87608ea6f..70eb06ca40f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeIntervalHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeIntervalHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TimeIntervalHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TimeIntervalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeObservationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeObservationHandler.java
index f35139fc860..3ae92f07259 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeObservationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeObservationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TimeObservationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TimeObservationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TraceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TraceHandler.java
index 48ce97d5873..cd14b48f971 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TraceHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TraceHandler.java
@@ -23,11 +23,11 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TraceHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TraceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
+	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
 	 * 
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TransitionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TransitionHandler.java
index d8c0874cd74..835bba6548e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TransitionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TransitionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TransitionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TransitionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TriggerHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TriggerHandler.java
index 3f229446af6..2cd1744d677 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TriggerHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TriggerHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TriggerHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TriggerHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypeHandler.java
index 29bea940919..9cad1bbfea1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypeHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypeHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TypeHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TypeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypedElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypedElementHandler.java
index 223bd73524b..8c308333bbf 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypedElementHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypedElementHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class TypedElementHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class TypedElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UnmarshallActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UnmarshallActionHandler.java
index 462319379b0..61a3510e0d5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UnmarshallActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UnmarshallActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class UnmarshallActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class UnmarshallActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UsageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UsageHandler.java
index 03b1820d823..5bd3ec94b48 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UsageHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UsageHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class UsageHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class UsageHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UseCaseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UseCaseHandler.java
index efcfac64577..2073c7d6c94 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UseCaseHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UseCaseHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class UseCaseHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class UseCaseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValuePinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValuePinHandler.java
index 5e8d281d1c0..8f3c8bf97c1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValuePinHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValuePinHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ValuePinHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ValuePinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationActionHandler.java
index 28737427c8d..5fbe2f57bec 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ValueSpecificationActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ValueSpecificationActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationHandler.java
index 63a207bd75b..ed6146bf53a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class ValueSpecificationHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class ValueSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableActionHandler.java
index cdd36890567..382c9fec1e8 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class VariableActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class VariableActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableHandler.java
index 265677a1217..6baa16a2c56 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class VariableHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class VariableHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VertexHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VertexHandler.java
index 964990dfd1e..66d46db97ba 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VertexHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VertexHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class VertexHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class VertexHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteLinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteLinkActionHandler.java
index bdb7cad9923..dbef12af9a8 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteLinkActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteLinkActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class WriteLinkActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class WriteLinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteStructuralFeatureActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteStructuralFeatureActionHandler.java
index b7fba0b0d41..a39f56fefab 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteStructuralFeatureActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteStructuralFeatureActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class WriteStructuralFeatureActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class WriteStructuralFeatureActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteVariableActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteVariableActionHandler.java
index 948a1535e2d..0ca0c7f9cd9 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteVariableActionHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteVariableActionHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
  * 
  * @generated
  */
-public class WriteVariableActionHandler extends AbstractNattableCreateCommandHandler implements IHandler {
+public class WriteVariableActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
 
 	/**
 	 * <pre>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractNattableCreateCommandHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractUmlNattableCreateCommandHandler.java
index 532e48bd7c8..360fa808acd 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractNattableCreateCommandHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractUmlNattableCreateCommandHandler.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.uml.nattable.menu.handlers;
 

 import java.util.ArrayList;

 import java.util.Collection;

+import java.util.Set;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -26,35 +27,22 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

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

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor;

 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

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

 import org.eclipse.papyrus.uml.nattable.menu.messages.Messages;

-import org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler;

-import org.eclipse.papyrus.uml.service.types.utils.CommandContext;

+import org.eclipse.papyrus.uml.nattable.menu.util.TableMenuUtils;

+import org.eclipse.papyrus.uml.service.types.handlers.AbstractUmlCreateCommandHandler;

 import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;

-import org.eclipse.ui.IWorkbenchPart;

 

 /**

- * Default handler for Create command used in the ModelExplorer contextual ("Create new child") menu.

+ * Abstract handler for the creation commands of UML elements in the Nattable editor

  * 

  */

-public abstract class AbstractNattableCreateCommandHandler extends AbstractCreateCommandHandler {

+public abstract class AbstractUmlNattableCreateCommandHandler extends AbstractUmlCreateCommandHandler {

 

 	@Override

 	protected abstract IElementType getElementTypeToCreate();

 

-	/** Current createCommand for selection (updated in {@link AbstractNattableCreateCommandHandler#isEnabled()}) */

-	protected INattableModelManager getTableManager() {

-		IWorkbenchPart activePart = getActiveWorkbenchPart();

-		if(activePart instanceof AbstractMultiPageSashEditor) {

-			activePart = ((AbstractMultiPageSashEditor)activePart).getActiveEditor();

-			if(activePart != null) {

-				return (INattableModelManager)activePart.getAdapter(INattableModelManager.class);

-			}

-

-		}

-		return null;

-	}

 

 	/**

 	 * <pre>

@@ -71,8 +59,8 @@ public abstract class AbstractNattableCreateCommandHandler extends AbstractCreat
 	protected Command buildCommand() {

 		Command createCmd = super.buildCommand();

 

-		final INattableModelManager natTable = getTableManager();

-		if(natTable != null) {

+		final INattableModelManager nattableModelManager = TableMenuUtils.getTableManager(getActiveWorkbenchPart());

+		if(nattableModelManager != null) {

 			CompositeCommand cmd = new CompositeCommand(""); //$NON-NLS-1$

 			cmd.add(new EMFtoGMFCommandWrapper(createCmd));

 

@@ -85,7 +73,7 @@ public abstract class AbstractNattableCreateCommandHandler extends AbstractCreat
 					EObject newElement = request.getNewElement();

 					Collection<Object> toAdd = new ArrayList<Object>();

 					toAdd.add(newElement);

-					Command tmp = natTable.getAddRowElementCommand(toAdd);

+					Command tmp = nattableModelManager.getAddRowElementCommand(toAdd);

 					if(tmp != null) {

 						tmp.execute();

 					}

@@ -101,18 +89,27 @@ public abstract class AbstractNattableCreateCommandHandler extends AbstractCreat
 

 	@Override

 	protected ICommandContext getCommandContext() {

-		INattableModelManager manager = getTableManager();

-		if(manager != null) {

-			final EObject container = manager.getTable().getContext();

-			ICommandContext context = null;

-			if(container != null) {

-				context = new CommandContext(container);

-			}

+		return TableMenuUtils.getTableCommandContext(TableMenuUtils.getTableManager(getActiveWorkbenchPart()));

 

-			return context;

-		}

-		return null;

+	}

 

+	@Override

+	public void setEnabled(Object evaluationContext) {

+		Command command = getCommand();

+		boolean isEnabled = command.canExecute();

+		if(isEnabled) {

+			IElementType newElementType = getElementTypeToCreate();

+			INattableModelManager tableManager = TableMenuUtils.getTableManager(getActiveWorkbenchPart());

+			String id = newElementType.getId();

+			Set<String> visibleCommands = getFilterIds();

+			isEnabled = tableManager.canCreateRowElement(id);

+			isEnabled &= visibleCommands.contains(id);

+		}

+		setBaseEnabled(isEnabled);

 	}

 

+	@Override

+	public void dispose() {

+		super.dispose();

+	}

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/UMLNattableCreateMenu.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/UMLNattableCreateMenu.java
deleted file mode 100644
index 2243db0693b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/UMLNattableCreateMenu.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.uml.nattable.menu.handlers;

-

-import org.eclipse.papyrus.uml.nattable.menu.tester.TableEditorPropertyTester;

-import org.eclipse.papyrus.uml.service.types.menu.AbstractCreateUmlChildMenu;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.menus.IContributionRoot;

-import org.eclipse.ui.services.IServiceLocator;

-

-

-public class UMLNattableCreateMenu extends AbstractCreateUmlChildMenu {

-

-	private TableEditorPropertyTester tester = new TableEditorPropertyTester();

-

-	@Override

-	public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {

-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();

-		if(tester.test(part, TableEditorPropertyTester.IS_TABLE, null, Boolean.TRUE)) {

-			super.createContributionItems(serviceLocator, additions);

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/util/TableMenuUtils.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/util/TableMenuUtils.java
new file mode 100644
index 00000000000..37963dbc973
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/util/TableMenuUtils.java
@@ -0,0 +1,66 @@
+/*****************************************************************************

+ * Copyright (c) 2013 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:

+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

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

+package org.eclipse.papyrus.uml.nattable.menu.util;

+

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

+import org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor;

+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

+import org.eclipse.papyrus.uml.service.types.utils.CommandContext;

+import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;

+import org.eclipse.ui.IWorkbenchPart;

+

+/**

+ * Utilities for the creation of contextual menus from the Nattable editor

+ */

+public class TableMenuUtils {

+

+	/**

+	 * FIXME move me in an upper plugin

+	 * 

+	 * @param tableManager

+	 *        the table manager

+	 * @return

+	 *         the command context to use to create new elements in the table

+	 */

+	public static ICommandContext getTableCommandContext(INattableModelManager tableManager) {

+		INattableModelManager manager = tableManager;

+		if(manager != null) {

+			final EObject container = manager.getTable().getContext();

+			ICommandContext context = null;

+			if(container != null) {

+				context = new CommandContext(container);

+			}

+			return context;

+		}

+		return null;

+	}

+

+	/**

+	 * FIXME move me in an upper plugin

+	 * 

+	 * @param activeWorkbenchPart

+	 * @return

+	 *         the table manager from the workbench part

+	 */

+	public static INattableModelManager getTableManager(IWorkbenchPart activeWorkbenchPart) {

+		IWorkbenchPart activePart = activeWorkbenchPart;

+		if(activePart instanceof AbstractMultiPageSashEditor) {

+			activePart = ((AbstractMultiPageSashEditor)activePart).getActiveEditor();

+			if(activePart != null) {

+				return (INattableModelManager)activePart.getAdapter(INattableModelManager.class);

+			}

+

+		}

+		return null;

+	}

+

+}