312598: [Use case editor] Why does "subject" default to being a component?

https://bugs.eclipse.org/bugs/show_bug.cgi?id=312598
author: ptessier 2012-04-13 08:34:04 +0000
committer: ptessier 2012-04-13 08:34:04 +0000
commit: cb120f756ec873270958c3833bfd19f90f7f3b81 (patch)
tree: 8d28d5b87decfbe5bea320ac5db36c1f91fc4c7a /plugins
parent: 569f8205f13309150b82d0bdb02d628f376b5185 (diff)
download: org.eclipse.papyrus-cb120f756ec873270958c3833bfd19f90f7f3b81.tar.gz
org.eclipse.papyrus-cb120f756ec873270958c3833bfd19f90f7f3b81.tar.xz
org.eclipse.papyrus-cb120f756ec873270958c3833bfd19f90f7f3b81.zip
50 files changed, 935 insertions, 3202 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/ChangeUseCasetoClassifierShapeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/ChangeUseCasetoClassifierShapeCommand.java
new file mode 100644
index 00000000000..796dfb296b0
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/ChangeUseCasetoClassifierShapeCommand.java
@@ -0,0 +1,81 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.usecase.command;
+
+import java.util.Collections;
+import java.util.Iterator;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLViewProvider;
+
+/**
+ * this is the specific command in charge to transform an element editpart into a defaultShape
+ * 
+ */
+public class ChangeUseCasetoClassifierShapeCommand extends AbstractTransactionalCommand {
+
+	protected GraphicalEditPart elementEditPart;
+
+	/**
+	 * 
+	 * Constructor of this command
+	 * 
+	 * @param domain
+	 *        the transactional editing domain to execute transaction
+	 * @param classView
+	 *        the editpart that will be transformed
+	 */
+	public ChangeUseCasetoClassifierShapeCommand(TransactionalEditingDomain domain, GraphicalEditPart classView) {
+		super(domain, "ChangeToDefaultNamedElement", Collections.EMPTY_LIST);
+		this.elementEditPart = classView;
+	}
+
+	public IElementType getUMLElementType(int elementID) {
+		return UMLElementTypes.getElementType(elementID);
+	}
+
+	public int getNodeVisualID(View containerView, EObject domainElement) {
+		return UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);
+	}
+
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		//creation of the node
+		UMLViewProvider umlViewProvider = new UMLViewProvider();
+		View container = (View)elementEditPart.getNotationView().eContainer();
+		Node packageview = umlViewProvider.createUseCase_2014(elementEditPart.resolveSemanticElement(), container, -1, true, elementEditPart.getDiagramPreferencesHint());
+		packageview.setLayoutConstraint(((Node)elementEditPart.getNotationView()).getLayoutConstraint());
+		//copy of all eannotations
+		Iterator<EAnnotation> iter = elementEditPart.getNotationView().getEAnnotations().iterator();
+		while(iter.hasNext()) {
+			EAnnotation annotation = EcoreUtil.copy(iter.next());
+			packageview.getEAnnotations().add(annotation);
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseClassifierFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseClassifierFigure.java
index f910bdeee5c..2bd7e2fd925 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseClassifierFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseClassifierFigure.java
@@ -13,27 +13,102 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.usecase.figure;
 
+import java.util.List;
+
+import org.eclipse.draw2d.AbstractLayout;
+import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RectangleFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.IEllipseFigure;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
 
 /**
- * The Class UseCaseFigure.
- * modified by Patrick Tessier inorder to extends nodeName
+ * this figure is the representation of a subject in the usecase diagram
+ * 
  */
-public class UseCaseClassifierFigure extends NodeNamedElementFigure implements IPapyrusNodeUMLElementFigure, IEllipseFigure {
+public class UseCaseClassifierFigure extends NodeNamedElementFigure {
 
 	private final RectangleFigure shapeCompartment;
 
 	/**
-	 * Instantiates a new use case figure.
+	 * this is the layout manager in charge to place element in the enumeration
+	 * 
 	 */
+	private class SubjectLayoutManager extends AbstractLayout {
+
+		/**
+		 * gap in x to display name stereotypes and qualified name
+		 */
+		protected final int GAP_X = 10;
+
+		/**
+		 * gap in y to display the first label at the top of the package
+		 */
+		protected final int GAP_Y = 5;
+
+		/**
+		 * 
+		 * {@inheritDoc}
+		 */
+		@Override
+		protected Dimension calculatePreferredSize(IFigure container, int hint, int hint2) {
+			int minimumWith = 0;
+			int minimumHeight = 0;
+			// display name
+			if(getNameLabel() != null) {
+				if(getNameLabel().getPreferredSize().width > minimumWith) {
+					minimumWith = getNameLabel().getPreferredSize().width;
+				}
+				minimumHeight += getNameLabel().getPreferredSize().height;
+			}
+			return new Dimension(minimumWith, minimumHeight);
+		}
+
+		/**
+		 * 
+		 * {@inheritDoc}
+		 */
+		public void layout(IFigure container) {
+			List childrenList = container.getChildren();
+			for(int i = 0; i < container.getChildren().size(); i++) {
+				Rectangle bound = new Rectangle(((IFigure)childrenList.get(i)).getBounds());
+				IFigure fig = ((IFigure)childrenList.get(i));
+				fig.invalidate();
+				Dimension pref = ((IFigure)childrenList.get(i)).getPreferredSize();
+				fig.invalidate();
+				Dimension prefConstraint = ((IFigure)childrenList.get(i)).getPreferredSize(container.getBounds().width , -1);
+					bound.setSize(prefConstraint);
+				if(i > 0) {
+					bound.y = ((IFigure)childrenList.get(i - 1)).getBounds().getBottomLeft().y + 1;
+					bound.x = getBounds().x + GAP_X;
+				} else {
+					bound.x = getBounds().x + GAP_X;
+					bound.y = getBounds().y + GAP_Y;
+				}
+				((IFigure)childrenList.get(i)).setBounds(bound);
+			}
+			// container
+			Rectangle lastRectangle = getExtensionPointContainerFigure().getBounds();
+			lastRectangle.height = getBounds().y + getBounds().height - lastRectangle.y;
+			lastRectangle.x = container.getBounds().x;
+			lastRectangle.width = getBounds().width;
+			//getPackageableElementFigure().setBounds(lastRectangle);
+			if(getGMFExtensionPointContainerFigure() != null) {
+				//getGMFPackageableElementContainer().setBounds(lastRectangle);
+			}
+		}
+	}
+
 	public UseCaseClassifierFigure() {
 		super();
+		setLayoutManager(new SubjectLayoutManager());
+		setOpaque(false);
 		shapeCompartment = new RectangleFigure();
 		add(shapeCompartment);
+		getExtensionPointContainerFigure().setFill(false);
 	}
 
 	/**
@@ -41,9 +116,9 @@ public class UseCaseClassifierFigure extends NodeNamedElementFigure implements I
 	 * 
 	 * @return the gmf container
 	 */
-	public ShapeCompartmentFigure getGMFExtensionPointContainer() {
+	public org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure getGMFExtensionPointContainerFigure() {
 		if(shapeCompartment.getChildren().size() > 0) {
-			return (ShapeCompartmentFigure)shapeCompartment.getChildren().get(0);
+			return (org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure)shapeCompartment.getChildren().get(0);
 		}
 		return null;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/ChangeShapeHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/ChangeShapeHandler.java
index 6d52a71d7ff..8edf4f75977 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/ChangeShapeHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/ChangeShapeHandler.java
@@ -64,7 +64,6 @@ public abstract class ChangeShapeHandler extends AbstractHandler {
 		return null;
 	}
 
-	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		final GraphicalEditPart editPart = getSelectedGraphicalEditpart();
 		ServiceUtilsForActionHandlers util = new ServiceUtilsForActionHandlers();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/DefaultNamedElementHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/DefaultNamedElementHandler.java
index 6712d05d778..534bc1f51db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/DefaultNamedElementHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/DefaultNamedElementHandler.java
@@ -18,9 +18,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.papyrus.uml.diagram.usecase.command.ElementToDefaultNamedElementShape;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;
 
 /**
  * the goal of this class is to transform a change a Subject as a default named Element
@@ -35,7 +33,7 @@ public class DefaultNamedElementHandler extends ChangeShapeHandler implements IH
 	@Override
 	public boolean isEnabled() {
 		GraphicalEditPart editPart = getSelectedGraphicalEditpart();
-		if((editPart instanceof SubjectClassEditPartTN) || (editPart instanceof SubjectComponentEditPartTN) || (editPart instanceof SubjectInterfaceEditPartTN)) {
+		if((editPart instanceof SubjectClassifierEditPartTN)) {
 			return true;
 		}
 		return false;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/SubjectHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/SubjectHandler.java
index bc98b653e4d..d308683fb35 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/SubjectHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/SubjectHandler.java
@@ -16,9 +16,7 @@ package org.eclipse.papyrus.uml.diagram.usecase.handler;
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.command.ChangetoDefaultShapeCommand;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;
 import org.eclipse.uml2.uml.Interface;
 
 /**
@@ -32,7 +30,7 @@ public class SubjectHandler extends ChangeShapeHandler implements IHandler {
 	public boolean isEnabled() {
 		GraphicalEditPart editPart = getSelectedGraphicalEditpart();
 		if((editPart.resolveSemanticElement() instanceof org.eclipse.uml2.uml.Class) || (editPart.resolveSemanticElement() instanceof Interface)) {
-			if((editPart instanceof SubjectClassEditPartTN) || (editPart instanceof SubjectComponentEditPartTN) || (editPart instanceof SubjectInterfaceEditPartTN)) {
+			if((editPart instanceof SubjectClassifierEditPartTN) ) {
 				return false;
 			} else {
 				return true;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/UseCaseToClassiferHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/UseCaseToClassiferHandler.java
new file mode 100644
index 00000000000..b4ae445449e
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/UseCaseToClassiferHandler.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.usecase.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.command.ChangeUseCasetoClassifierShapeCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;
+
+/**
+ * the goal of this class is to transform a change a Subject as a default named Element
+ * 
+ */
+public class UseCaseToClassiferHandler extends ChangeShapeHandler implements IHandler {
+
+	protected TransactionalEditingDomain transactionalEditingDomain = null;
+
+	protected org.eclipse.uml2.uml.Element selectedElement = null;
+
+	@Override
+	public boolean isEnabled() {
+		GraphicalEditPart editPart = getSelectedGraphicalEditpart();
+		if((editPart instanceof UseCaseEditPartTN) || (editPart instanceof UseCaseInComponentEditPart) || (editPart instanceof UseCaseInPackageEditPart)) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	protected AbstractTransactionalCommand getChangeShapeCommand(GraphicalEditPart editPart) {
+		ChangeUseCasetoClassifierShapeCommand command = new ChangeUseCasetoClassifierShapeCommand(editPart.getEditingDomain(), editPart);
+		return command;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
index 09597852735..02c1a1d5bcc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI
-    xmi:version="2.0"
+<xmi:XMI xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"
@@ -45,7 +44,7 @@
           canonicalEditPolicyClassName="ExtensionPointCanonicalEditPolicy"
           graphicalNodeEditPolicyClassName="ExtensionPointGraphicalNodeEditPolicy"
           createCommandClassName="ExtensionPointCreateCommand"
-          containers="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.7">
+          containers="/0/@diagram/@compartments.0 /0/@diagram/@compartments.3 /0/@diagram/@compartments.5">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -136,10 +135,10 @@
           itemSemanticEditPolicyClassName="UseCaseInComponentItemSemanticEditPolicy"
           notationViewFactoryClassName="UseCase3ViewFactory"
           canonicalEditPolicyClassName="UseCaseInComponentCanonicalEditPolicy"
-          compartments="/0/@diagram/@compartments.5"
+          compartments="/0/@diagram/@compartments.3"
           graphicalNodeEditPolicyClassName="UseCaseInComponentGraphicalNodeEditPolicy"
           createCommandClassName="UseCaseInComponentCreateCommand"
-          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.6 /0/@diagram/@compartments.8 /0/@diagram/@compartments.3 /0/@diagram/@compartments.4">
+          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.6">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -217,10 +216,10 @@
           itemSemanticEditPolicyClassName="ComponentInComponentItemSemanticEditPolicy"
           notationViewFactoryClassName="Component2ViewFactory"
           canonicalEditPolicyClassName="ComponentInComponentCanonicalEditPolicy"
-          compartments="/0/@diagram/@compartments.6"
+          compartments="/0/@diagram/@compartments.4"
           graphicalNodeEditPolicyClassName="ComponentInComponentGraphicalNodeEditPolicy"
           createCommandClassName="ComponentInComponentCreateCommand"
-          containers="/0/@diagram/@compartments.8 /0/@diagram/@compartments.6">
+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.4">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -299,7 +298,7 @@
           canonicalEditPolicyClassName="CommentCanonicalEditPolicyCN"
           graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicyCN"
           createCommandClassName="CommentCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.2 /0/@diagram/@compartments.10 /0/@diagram/@compartments.3 /0/@diagram/@compartments.4">
+          containers="/0/@diagram/@compartments.4 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.2 /0/@diagram/@compartments.8">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -365,7 +364,7 @@
           canonicalEditPolicyClassName="ConstraintInComponentCanonicalEditPolicy"
           graphicalNodeEditPolicyClassName="ConstraintInComponentGraphicalNodeEditPolicy"
           createCommandClassName="ConstraintInComponentCreateCommand"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.8 /0/@diagram/@compartments.2 /0/@diagram/@compartments.3 /0/@diagram/@compartments.4">
+          containers="/0/@diagram/@compartments.4 /0/@diagram/@compartments.6 /0/@diagram/@compartments.2">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -442,7 +441,7 @@
           canonicalEditPolicyClassName="ActorInComponentCanonicalEditPolicy"
           graphicalNodeEditPolicyClassName="ActorInComponentGraphicalNodeEditPolicy"
           createCommandClassName="ActorInComponentCreateCommand"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.8">
+          containers="/0/@diagram/@compartments.4 /0/@diagram/@compartments.6">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -524,7 +523,7 @@
           canonicalEditPolicyClassName="ConstraintInPackageCanonicalEditPolicy"
           graphicalNodeEditPolicyClassName="ConstraintInPackageGraphicalNodeEditPolicy"
           createCommandClassName="ConstraintInPackageCreateCommand"
-          containers="/0/@diagram/@compartments.9 /0/@diagram/@compartments.10">
+          containers="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -601,7 +600,7 @@
           canonicalEditPolicyClassName="ActorInPackageCanonicalEditPolicy"
           graphicalNodeEditPolicyClassName="ActorInPackageGraphicalNodeEditPolicy"
           createCommandClassName="ActorInPackageCreateCommand"
-          containers="/0/@diagram/@compartments.9 /0/@diagram/@compartments.10">
+          containers="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -681,10 +680,10 @@
           itemSemanticEditPolicyClassName="UseCaseInPackageItemSemanticEditPolicy"
           notationViewFactoryClassName="UseCase4ViewFactory"
           canonicalEditPolicyClassName="UseCaseInPackageCanonicalEditPolicy"
-          compartments="/0/@diagram/@compartments.7"
+          compartments="/0/@diagram/@compartments.5"
           graphicalNodeEditPolicyClassName="UseCaseInPackageGraphicalNodeEditPolicy"
           createCommandClassName="UseCaseInPackageCreateCommand"
-          containers="/0/@diagram/@compartments.9 /0/@diagram/@compartments.10">
+          containers="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -762,10 +761,10 @@
           itemSemanticEditPolicyClassName="ComponentInPackageItemSemanticEditPolicy"
           notationViewFactoryClassName="Component3ViewFactory"
           canonicalEditPolicyClassName="ComponentInPackageCanonicalEditPolicy"
-          compartments="/0/@diagram/@compartments.8"
+          compartments="/0/@diagram/@compartments.6"
           graphicalNodeEditPolicyClassName="ComponentInPackageGraphicalNodeEditPolicy"
           createCommandClassName="ComponentInPackageCreateCommand"
-          containers="/0/@diagram/@compartments.9 /0/@diagram/@compartments.10">
+          containers="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -842,10 +841,10 @@
           itemSemanticEditPolicyClassName="PackageItemSemanticEditPolicyCN"
           notationViewFactoryClassName="Package3ViewFactory"
           canonicalEditPolicyClassName="PackageCanonicalEditPolicyCN"
-          compartments="/0/@diagram/@compartments.9"
+          compartments="/0/@diagram/@compartments.7"
           graphicalNodeEditPolicyClassName="PackageGraphicalNodeEditPolicyCN"
           createCommandClassName="PackageCreateCommandCN"
-          containers="/0/@diagram/@compartments.9 /0/@diagram/@compartments.10">
+          containers="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -1214,13 +1213,13 @@
       </topLevelNodes>
       <topLevelNodes
           visualID="2015"
-          editPartClassName="SubjectComponentEditPartTN"
-          itemSemanticEditPolicyClassName="SubjectComponentItemSemanticEditPolicyTN"
+          editPartClassName="SubjectClassifierEditPartTN"
+          itemSemanticEditPolicyClassName="SubjectClassifierItemSemanticEditPolicyTN"
           notationViewFactoryClassName="ComponentViewFactory"
-          canonicalEditPolicyClassName="SubjectComponentCanonicalEditPolicyTN"
+          canonicalEditPolicyClassName="SubjectClassifierCanonicalEditPolicyTN"
           compartments="/0/@diagram/@compartments.2"
-          graphicalNodeEditPolicyClassName="SubjectComponentGraphicalNodeEditPolicyTN"
-          createCommandClassName="SubjectComponentCreateCommandTN">
+          graphicalNodeEditPolicyClassName="SubjectClassifiertGraphicalNodeEditPolicyTN"
+          createCommandClassName="SubjectClassifierCreateCommandTN">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
@@ -1248,7 +1247,7 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>
+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier"/>
           <containmentMetaFeature
               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
           <childMetaFeature
@@ -1265,160 +1264,8 @@
         </modelFacet>
         <labels
             visualID="5019"
-            editPartClassName="SubjectComponentNameEditPartTN"
-            itemSemanticEditPolicyClassName="SubjectComponentNameItemSemanticEditPolicyTN"
-            notationViewFactoryClassName="ComponentNameViewFactory"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:StyleAttributes"
-                fixedFont="true"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2020"
-          editPartClassName="SubjectClassEditPartTN"
-          itemSemanticEditPolicyClassName="SubjectClassItemSemanticEditPolicyTN"
-          notationViewFactoryClassName="ComponentViewFactory"
-          canonicalEditPolicyClassName="SubjectClassCanonicalEditPolicyTN"
-          compartments="/0/@diagram/@compartments.3"
-          graphicalNodeEditPolicyClassName="SubjectClassGraphicalNodeEditPolicyTN"
-          createCommandClassName="SubjectClassCreateCommandTN">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="SubjectEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.figure.SubjectFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="200"
-              height="400"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/ownedType"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.4">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="6037"
-            editPartClassName="SubjectClassNameEditPartTN"
-            itemSemanticEditPolicyClassName="SubjectClassNameItemSemanticEditPolicyTN"
-            notationViewFactoryClassName="ComponentNameViewFactory"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:StyleAttributes"
-                fixedFont="true"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2021"
-          editPartClassName="SubjectInterfaceEditPartTN"
-          itemSemanticEditPolicyClassName="SubjectInterfaceItemSemanticEditPolicyTN"
-          notationViewFactoryClassName="ComponentViewFactory"
-          canonicalEditPolicyClassName="SubjectInterfaceCanonicalEditPolicyTN"
-          compartments="/0/@diagram/@compartments.4"
-          graphicalNodeEditPolicyClassName="SubjectInterfaceGraphicalNodeEditPolicyTN"
-          createCommandClassName="SubjectInterfaceCreateCommandTN">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="SubjectEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.figure.SubjectFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="200"
-              height="400"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/ownedType"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.4">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="6038"
-            editPartClassName="SubjectInterfaceNameEditPartTN"
-            itemSemanticEditPolicyClassName="SubjectInterfaceNameItemSemanticEditPolicyTN"
+            editPartClassName="SubjectClassifierNameEditPartTN"
+            itemSemanticEditPolicyClassName="SubjectClassifierNameItemSemanticEditPolicyTN"
             notationViewFactoryClassName="ComponentNameViewFactory"
             elementIcon="true">
           <diagramRunTimeClass
@@ -1446,7 +1293,7 @@
           itemSemanticEditPolicyClassName="PackageItemSemanticEditPolicyTN"
           notationViewFactoryClassName="Package2ViewFactory"
           canonicalEditPolicyClassName="PackageCanonicalEditPolicyTN"
-          compartments="/0/@diagram/@compartments.10"
+          compartments="/0/@diagram/@compartments.8"
           graphicalNodeEditPolicyClassName="PackageGraphicalNodeEditPolicyTN"
           createCommandClassName="PackageCreateCommandTN">
         <diagramRunTimeClass
@@ -2608,52 +2455,6 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>
       </compartments>
       <compartments
-          visualID="7018"
-          editPartClassName="SubjectClassUsecasesEditPart"
-          itemSemanticEditPolicyClassName="SubjectClassUsecasesItemSemanticEditPolicy"
-          notationViewFactoryClassName="ComponentUsecasesViewFactory"
-          canonicalEditPolicyClassName="SubjectClassUsecasesCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5"
-          title="use cases"
-          canCollapse="false"
-          needsTitle="false"
-          node="/0/@diagram/@topLevelNodes.5"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getUseCasesContainerFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7019"
-          editPartClassName="SubjectInterfaceUsecasesEditPart"
-          itemSemanticEditPolicyClassName="SubjectInterfaceUsecasesItemSemanticEditPolicy"
-          notationViewFactoryClassName="ComponentUsecasesViewFactory"
-          canonicalEditPolicyClassName="SubjectInterfaceUsecasesCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5"
-          title="use cases"
-          canCollapse="false"
-          needsTitle="false"
-          node="/0/@diagram/@topLevelNodes.6"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getUseCasesContainerFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
           visualID="7012"
           editPartClassName="UseCasePointsInComponentEditPart"
           itemSemanticEditPolicyClassName="UseCasePointsInComponentItemSemanticEditPolicy"
@@ -2780,7 +2581,7 @@
           title="PackageableElementCompartment"
           canCollapse="false"
           needsTitle="false"
-          node="/0/@diagram/@topLevelNodes.7"
+          node="/0/@diagram/@topLevelNodes.5"
           listLayout="false">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -2813,7 +2614,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
               id="&quot;usecase.tool.package&quot;"
-              genNodes="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.7"/>
+              genNodes="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.5"/>
           <entries
               xsi:type="gmfgen:ToolEntry"
               title="Subject"
@@ -2821,7 +2622,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
               id="&quot;usecase.tool.subject&quot;"
-              genNodes="/0/@diagram/@topLevelNodes.4 /0/@diagram/@childNodes.10 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6"/>
+              genNodes="/0/@diagram/@topLevelNodes.4 /0/@diagram/@childNodes.10"/>
           <entries
               xsi:type="gmfgen:ToolEntry"
               title="Actor"
@@ -2845,7 +2646,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
               id="&quot;usecase.tool.constraint&quot;"
-              genNodes="/0/@diagram/@childNodes.5 /0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.8"/>
+              genNodes="/0/@diagram/@childNodes.5 /0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.6"/>
           <entries
               xsi:type="gmfgen:ToolEntry"
               title="Comment"
@@ -2853,7 +2654,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
               id="&quot;usecase.tool.comment&quot;"
-              genNodes="/0/@diagram/@childNodes.4 /0/@diagram/@topLevelNodes.9"/>
+              genNodes="/0/@diagram/@childNodes.4 /0/@diagram/@topLevelNodes.7"/>
         </groups>
         <groups
             title="Children"
@@ -3112,7 +2913,7 @@
         extensibleViaService="true">
       <implementations
           xsi:type="gmfgen:PredefinedParser"
-          uses="/0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@childNodes.0/@labelModelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labelModelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet /0/@diagram/@childNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.0/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet"/>
+          uses="/0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@childNodes.0/@labelModelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labelModelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet /0/@diagram/@childNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.0/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet"/>
       <implementations
           xsi:type="gmfgen:ExternalParser"
           uses="/0/@diagram/@links.0/@labels.0/@modelFacet /0/@diagram/@links.1/@labels.0/@modelFacet"/>
@@ -3122,7 +2923,7 @@
           qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>
       <implementations
           xsi:type="gmfgen:CustomParser"
-          uses="/0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet"
+          uses="/0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet"
           qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>
     </labelParsers>
     <contextMenus
@@ -3137,7 +2938,7 @@
     <extensionNodes
         xsi:type="papyrusgmfgenextension:ExtendedGenView"
         comment="manage edit part that extends NamedElementEditPart in common"
-        genView="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.9 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3"
+        genView="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.8 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.9 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3"
         name="NamedElementEditPart"
         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>
     <extensionNodes
@@ -3149,25 +2950,25 @@
     <extensionNodes
         xsi:type="papyrusgmfgenextension:ExtendedGenView"
         comment="add superclass for short cut"
-        genView="/0/@diagram/@topLevelNodes.11"
+        genView="/0/@diagram/@topLevelNodes.9"
         name="AbstractShortCutDiagramEditPart"
         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart"/>
     <extensionNodes
         xsi:type="papyrusgmfgenextension:ExtendedGenView"
         comment="Name of the shorcut diagram"
-        genView="/0/@diagram/@topLevelNodes.11/@labels.0"
+        genView="/0/@diagram/@topLevelNodes.9/@labels.0"
         name="AbstractShortcutDiagramNameEditPart"
         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortcutDiagramNameEditPart"/>
     <extensionNodes
         xsi:type="papyrusgmfgenextension:ExtendedGenView"
         comment="add superclass for compartment"
-        genView="/0/@diagram/@compartments.0 /0/@diagram/@compartments.1 /0/@diagram/@compartments.5 /0/@diagram/@compartments.7"
+        genView="/0/@diagram/@compartments.0 /0/@diagram/@compartments.1 /0/@diagram/@compartments.3 /0/@diagram/@compartments.5"
         name="ResizeableListCompartmentEditPart"
         superOwnedEditPart="org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart"/>
     <extensionNodes
         xsi:type="papyrusgmfgenextension:ExtendedGenView"
         comment="this is an extension to manage the comment"
-        genView="/0/@diagram/@childNodes.4 /0/@diagram/@topLevelNodes.9"
+        genView="/0/@diagram/@childNodes.4 /0/@diagram/@topLevelNodes.7"
         name="comment extended node"
         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>
     <extensionNodes
@@ -3183,7 +2984,7 @@
         role="Name"
         iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png"
         linkLabels="/0/@diagram/@links.5/@labels.0 /0/@diagram/@links.7/@labels.0 /0/@diagram/@links.8/@labels.0 /0/@diagram/@links.9/@labels.0"
-        externalNodeLabels="/0/@diagram/@topLevelNodes.11/@labels.0 /0/@diagram/@childNodes.6/@labels.0 /0/@diagram/@childNodes.8/@labels.0 /0/@diagram/@topLevelNodes.0/@labels.0"/>
+        externalNodeLabels="/0/@diagram/@topLevelNodes.9/@labels.0 /0/@diagram/@childNodes.6/@labels.0 /0/@diagram/@childNodes.8/@labels.0 /0/@diagram/@topLevelNodes.0/@labels.0"/>
     <extensionNodes
         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"
         comment="Stereotype"
@@ -3211,11 +3012,11 @@
         xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService"
         comment="List of editpart using the delete service"
         name="DeleteService editpart List"
-        genView="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.11 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11"/>
+        genView="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.9 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11"/>
     <extensionNodes
         xsi:type="papyrusgmfgenextension:ExtendedGenView"
         comment="to manage SubjectNodes"
-        genView="/0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6"
+        genView="/0/@diagram/@topLevelNodes.4"
         name="SubjectNodes"
         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>
   </papyrusgmfgenextension:PapyrusExtensionRootNode>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
index 6b0a40a06f2..c18b6dd05a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
@@ -183,7 +183,7 @@
       <viewProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLViewProvider">
          <Priority name="Lowest"/>
          <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="UseCase"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2011,2012,2013,2014,2015,2020,2021,2016,2017,2018,2022,2019,3007,3008,3009,3016,3015,3017,3018,3010,3011,3012,3013,3014"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2011,2012,2013,2014,2015,2016,2017,2018,2022,2019,3007,3008,3009,3016,3015,3017,3018,3010,3011,3012,3013,3014"/>
          <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4008,4009,4010,4011,4012,4013,4014,4015,4016,4017,4018,4019"/>
       </viewProvider>
    </extension>
@@ -196,16 +196,16 @@
             <method name="getType()" value="UseCase"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
-            <method name="getType()" value="2011,2012,2013,2014,2015,2020,2021,2016,2017,2018,2022,2019,3007,3008,3009,3016,3015,3017,3018,3010,3011,3012,3013,3014"/>
+            <method name="getType()" value="2011,2012,2013,2014,2015,2016,2017,2018,2022,2019,3007,3008,3009,3016,3015,3017,3018,3010,3011,3012,3013,3014"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
             <method name="getType()" value="4008,4009,4010,4011,4012,4013,4014,4015,4016,4017,4018,4019"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
-            <method name="getType()" value="5014,6029,5015,5016,5017,5019,6037,6038,5025,5026,5027,6039,5032,5018,5030,5028,5029,5031,6027,5020,5021,6028,5022,5023,5024"/>
+            <method name="getType()" value="5014,6029,5015,5016,5017,5019,5025,5026,5027,6039,5032,5018,5030,5028,5029,5031,6027,5020,5021,6028,5022,5023,5024"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
-            <method name="getType()" value="7009,7010,7011,7018,7019,7012,7017,7014,7015,7016,7013"/>
+            <method name="getType()" value="7009,7010,7011,7012,7017,7014,7015,7016,7013"/>
          </object>
          <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
       </editpartProvider>
@@ -220,15 +220,13 @@
          <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN" id="Actor_2012"/>
          <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN" id="UseCase_2013"/>
          <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN" id="UseCase_2014"/>
-         <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN" id="Component_2015"/>
-         <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN" id="Class_2020"/>
-         <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN" id="Interface_2021"/>
+         <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN" id="Classifier_2015"/>
          <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN" id="Package_2016"/>
          <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN" id="Constraint_2017"/>
          <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN" id="Comment_2018"/>
          <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DefaultNamedElementEditPartTN" id="NamedElement_2022"/>
          <object class="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart" id="Diagram_2019"/>
-         <context elements="Package_1000,Actor_2011,Actor_2012,UseCase_2013,UseCase_2014,Component_2015,Class_2020,Interface_2021,Package_2016,Constraint_2017,Comment_2018,NamedElement_2022,Diagram_2019"/>
+         <context elements="Package_1000,Actor_2011,Actor_2012,UseCase_2013,UseCase_2014,Classifier_2015,Package_2016,Constraint_2017,Comment_2018,NamedElement_2022,Diagram_2019"/>
       </modelingAssistantProvider>
    </extension>
 
@@ -298,35 +296,15 @@
       </metamodel>
       <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
          <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.usecase.Component_2015"
-               name="%metatype.name.Component_2015"
+               id="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"
+               name="%metatype.name.Classifier_2015"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Component"
+               eclass="Classifier"
                edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.SubjectEditHelper">
             <param name="semanticHint" value="2015"/>
          </metamodelType>
       </metamodel>
       <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.usecase.Class_2020"
-               name="%metatype.name.Class_2020"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Class"
-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.SubjectEditHelper">
-            <param name="semanticHint" value="2020"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.usecase.Interface_2021"
-               name="%metatype.name.Interface_2021"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interface"
-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.SubjectEditHelper">
-            <param name="semanticHint" value="2021"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
          <specializationType
                id="org.eclipse.papyrus.uml.diagram.usecase.Package_2016"
                name="%metatype.name.Package_2016"
@@ -406,7 +384,7 @@
                id="org.eclipse.papyrus.uml.diagram.usecase.Component_3016"
                name="%metatype.name.Component_3016"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Component_2015"/>
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>
             <param name="semanticHint" value="3016"/>
          </specializationType>
       </metamodel>
@@ -471,7 +449,7 @@
                id="org.eclipse.papyrus.uml.diagram.usecase.Component_3013"
                name="%metatype.name.Component_3013"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Component_2015"/>
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>
             <param name="semanticHint" value="3013"/>
          </specializationType>
       </metamodel>
@@ -619,9 +597,7 @@
          <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Component_2015"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Class_2020"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Interface_2021"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Package_2016"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Comment_2018"/>
@@ -761,6 +737,20 @@
 		
 	<?gmfgen generated="true"?>
 	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.ClassifierPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.usecase.preferences.ClassifierPreferencePage"
+            name="Classifier Node" />
+	
+		
+	<?gmfgen generated="true"?>
+	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.CommentPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.usecase.preferences.CommentPreferencePage"
+            name="Comment Node" />
+	
+		
+	<?gmfgen generated="true"?>
+	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
 			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.ConstraintPreferencePage"
             id="org.eclipse.papyrus.uml.diagram.usecase.preferences.ConstraintPreferencePage"
             name="Constraint Node" />
@@ -796,27 +786,6 @@
 		
 	<?gmfgen generated="true"?>
 	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
-			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.CommentPreferencePage"
-            id="org.eclipse.papyrus.uml.diagram.usecase.preferences.CommentPreferencePage"
-            name="Comment Node" />
-	
-		
-	<?gmfgen generated="true"?>
-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
-			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.InterfacePreferencePage"
-            id="org.eclipse.papyrus.uml.diagram.usecase.preferences.InterfacePreferencePage"
-            name="Interface Node" />
-	
-		
-	<?gmfgen generated="true"?>
-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
-			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.ClassPreferencePage"
-            id="org.eclipse.papyrus.uml.diagram.usecase.preferences.ClassPreferencePage"
-            name="Class Node" />
-	
-		
-	<?gmfgen generated="true"?>
-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
 			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DefaultNamedElementPreferencePage"
             id="org.eclipse.papyrus.uml.diagram.usecase.preferences.DefaultNamedElementPreferencePage"
             name="DefaultNamedElement Node" />
@@ -1439,6 +1408,16 @@
                checkEnabled="true">
          </visibleWhen>
       </command>
+      <command
+            commandId="org.eclipse.papyrus.diagram.usecase.displayusecaseasclassifier.popup"
+            id="displayusecaseasclassifier.popup"
+            label="Display use case as classifier"
+            style="push"
+            tooltip="Display use case as classifier">
+         <visibleWhen
+               checkEnabled="true">
+         </visibleWhen>
+      </command>
    </menuContribution>
 </extension>
 <extension
@@ -1455,6 +1434,12 @@
          id="org.eclipse.papyrus.diagram.usecase.displayassubject.popup"
          name="Display as subject">
    </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.usecase.handler.UseCaseToClassiferHandler"
+         id="org.eclipse.papyrus.diagram.usecase.displayusecaseasclassifier.popup"
+         name="Display use case as classifier">
+   </command>
 </extension>
 
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectComponentCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectClassifierCreateCommandTN.java
index 480dc4b5e09..d5ddb69db1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectComponentCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectClassifierCreateCommandTN.java
@@ -12,15 +12,12 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.Classifier;
 
 /**
  * @generated
  */
-public class SubjectComponentCreateCommandTN extends EditElementCommand {
+public class SubjectClassifierCreateCommandTN extends EditElementCommand {
 
 	/**
 	 * @generated
@@ -35,7 +32,7 @@ public class SubjectComponentCreateCommandTN extends EditElementCommand {
 	/**
 	 * @generated
 	 */
-	public SubjectComponentCreateCommandTN(CreateElementRequest req, EObject eObject) {
+	public SubjectClassifierCreateCommandTN(CreateElementRequest req, EObject eObject) {
 		super(req.getLabel(), null, req);
 		this.eObject = eObject;
 		this.eClass = eObject != null ? eObject.eClass() : null;
@@ -44,14 +41,14 @@ public class SubjectComponentCreateCommandTN extends EditElementCommand {
 	/**
 	 * @generated
 	 */
-	public static SubjectComponentCreateCommandTN create(CreateElementRequest req, EObject eObject) {
-		return new SubjectComponentCreateCommandTN(req, eObject);
+	public static SubjectClassifierCreateCommandTN create(CreateElementRequest req, EObject eObject) {
+		return new SubjectClassifierCreateCommandTN(req, eObject);
 	}
 
 	/**
 	 * @generated
 	 */
-	public SubjectComponentCreateCommandTN(CreateElementRequest req) {
+	public SubjectClassifierCreateCommandTN(CreateElementRequest req) {
 		super(req.getLabel(), null, req);
 	}
 
@@ -82,19 +79,13 @@ public class SubjectComponentCreateCommandTN extends EditElementCommand {
 	 * @generated
 	 */
 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Component newElement = UMLFactory.eINSTANCE.createComponent();
-		Package owner = (Package)getElementToEdit();
-		owner.getPackagedElements().add(newElement);
-		ElementInitializers.getInstance().init_Component_2015(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest)getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
+		throw new UnsupportedOperationException("Unimplemented operation (abstract domain element).");
 	}
 
 	/**
 	 * @generated
 	 */
-	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+	protected void doConfigure(Classifier newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();
 		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
 		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java
index 9857086accb..10769607ba9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java
@@ -294,13 +294,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -333,13 +327,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -372,13 +360,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -429,13 +411,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -486,13 +462,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -543,13 +513,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -607,9 +571,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -621,9 +583,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -635,9 +595,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -655,9 +613,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -675,9 +631,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -695,9 +649,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -743,9 +695,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -757,9 +707,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -775,9 +723,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -798,9 +744,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -818,9 +762,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -838,9 +780,7 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
index 820aa325652..ffcc0a8c8c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
@@ -279,13 +279,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -318,13 +312,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -357,13 +345,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -414,13 +396,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -471,13 +447,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -528,13 +498,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -592,9 +556,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -606,9 +568,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -620,9 +580,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -640,9 +598,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -660,9 +616,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -680,9 +634,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -728,9 +680,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -742,9 +692,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -760,9 +708,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -783,9 +729,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -803,9 +747,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -823,9 +765,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
index a7b5bb51e73..fa41d9ba928 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
@@ -279,13 +279,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -318,13 +312,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -357,13 +345,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -414,13 +396,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -471,13 +447,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -528,13 +498,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -592,9 +556,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -606,9 +568,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -620,9 +580,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -640,9 +598,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -660,9 +616,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -680,9 +634,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -728,9 +680,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -742,9 +692,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -760,9 +708,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -783,9 +729,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -803,9 +747,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -823,9 +765,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
index 44a79a3a37e..aaef1152a5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
@@ -279,13 +279,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -318,13 +312,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -357,13 +345,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -414,13 +396,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -471,13 +447,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -528,13 +498,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -592,9 +556,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -606,9 +568,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -620,9 +580,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -640,9 +598,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -660,9 +616,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -680,9 +634,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -728,9 +680,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -742,9 +692,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -760,9 +708,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -783,9 +729,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -803,9 +747,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -823,9 +765,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java
index 8711c5297b2..d02a4ed6f9b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java
@@ -308,13 +308,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.CommentAnnotatedElement_4014);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.CommentAnnotatedElement_4014);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.CommentAnnotatedElement_4014);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.CommentAnnotatedElement_4014);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -372,9 +366,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.Comment_2018);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java
index 328a33b2c63..c1521d3c3c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java
@@ -308,13 +308,7 @@ public class CommentEditPartTN extends AbstractCommentEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.CommentAnnotatedElement_4014);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.CommentAnnotatedElement_4014);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.CommentAnnotatedElement_4014);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.CommentAnnotatedElement_4014);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -372,9 +366,7 @@ public class CommentEditPartTN extends AbstractCommentEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.Comment_2018);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java
index 7783da0b92a..e8fb56d09ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java
@@ -331,13 +331,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -370,13 +364,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -409,13 +397,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -466,13 +448,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -523,13 +499,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -580,13 +550,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -644,9 +608,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -658,9 +620,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -672,9 +632,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -692,9 +650,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -712,9 +668,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -732,9 +686,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -780,9 +732,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -794,9 +744,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -812,9 +760,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -835,9 +781,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -855,9 +799,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -875,9 +817,7 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
index 46a9110943c..438832129a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
@@ -331,13 +331,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -370,13 +364,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -409,13 +397,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -466,13 +448,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -523,13 +499,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -580,13 +550,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -644,9 +608,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -658,9 +620,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -672,9 +632,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -692,9 +650,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -712,9 +668,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -732,9 +686,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -780,9 +732,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -794,9 +744,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -812,9 +760,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -835,9 +781,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -855,9 +799,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -875,9 +817,7 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java
index f8e1f90eec0..c6cf81464ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java
@@ -302,13 +302,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -365,13 +359,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -422,13 +410,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -479,13 +461,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -536,13 +512,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -594,9 +564,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.Comment_2018);
@@ -616,9 +584,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -636,9 +602,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -656,9 +620,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -676,9 +638,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -723,9 +683,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -746,9 +704,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -766,9 +722,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -786,9 +740,7 @@ public class ConstraintEditPartTN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java
index 06fbbfd8d83..7d196ca603c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java
@@ -302,13 +302,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -365,13 +359,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -422,13 +410,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -479,13 +461,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -536,13 +512,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -594,9 +564,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.Comment_2018);
@@ -616,9 +584,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -636,9 +602,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -656,9 +620,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -676,9 +638,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -723,9 +683,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -746,9 +704,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -766,9 +722,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -786,9 +740,7 @@ public class ConstraintInComponentEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java
index 4d16e0d4d56..78eb9398e1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java
@@ -302,13 +302,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -365,13 +359,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -422,13 +410,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -479,13 +461,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -536,13 +512,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -594,9 +564,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.Comment_2018);
@@ -616,9 +584,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -636,9 +602,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -656,9 +620,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -676,9 +638,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -723,9 +683,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -746,9 +704,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -766,9 +722,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -786,9 +740,7 @@ public class ConstraintInPackageEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java
index de5592c4c3e..1b8e467c814 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java
@@ -298,13 +298,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -355,13 +349,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -412,13 +400,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -469,13 +451,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -527,9 +503,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -547,9 +521,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -567,9 +539,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -587,9 +557,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -634,9 +602,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -657,9 +623,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -677,9 +641,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -697,9 +659,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java
index 2ec4109052e..d7ec4774c34 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java
@@ -331,13 +331,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -388,13 +382,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -445,13 +433,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -502,13 +484,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -572,9 +548,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -592,9 +566,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -612,9 +584,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -632,9 +602,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -687,9 +655,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -710,9 +676,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -730,9 +694,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -750,9 +712,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -773,9 +733,7 @@ public class PackageEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java
index 52ad212704c..4a74579792b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java
@@ -332,13 +332,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {
@@ -389,13 +383,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {
@@ -446,13 +434,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {
@@ -503,13 +485,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {
@@ -573,9 +549,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -593,9 +567,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -613,9 +585,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -633,9 +603,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -688,9 +656,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -711,9 +677,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -731,9 +695,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -751,9 +713,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -774,9 +734,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectComponentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
index 7f7917bf499..44f600005bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectComponentEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
@@ -35,7 +35,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.SubjectComponentItemSemanticEditPolicyTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.SubjectClassifierItemSemanticEditPolicyTN;
 import org.eclipse.papyrus.uml.diagram.usecase.figure.SubjectFigure;
 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;
@@ -45,7 +45,7 @@ import org.eclipse.swt.graphics.Color;
 /**
  * @generated
  */
-public class SubjectComponentEditPartTN extends NamedElementEditPart {
+public class SubjectClassifierEditPartTN extends NamedElementEditPart {
 
 	/**
 	 * @generated
@@ -65,7 +65,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 	/**
 	 * @generated
 	 */
-	public SubjectComponentEditPartTN(View view) {
+	public SubjectClassifierEditPartTN(View view) {
 		super(view);
 	}
 
@@ -74,7 +74,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 	 */
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubjectComponentItemSemanticEditPolicyTN());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubjectClassifierItemSemanticEditPolicyTN());
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());
 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
@@ -135,8 +135,8 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 	 * @generated
 	 */
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof SubjectComponentNameEditPartTN) {
-			((SubjectComponentNameEditPartTN)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if(childEditPart instanceof SubjectClassifierNameEditPartTN) {
+			((SubjectClassifierNameEditPartTN)childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
 		if(childEditPart instanceof SubjectComponentUsecasesEditPart) {
@@ -152,7 +152,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 	 * @generated
 	 */
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof SubjectComponentNameEditPartTN) {
+		if(childEditPart instanceof SubjectClassifierNameEditPartTN) {
 			return true;
 		}
 		if(childEditPart instanceof SubjectComponentUsecasesEditPart) {
@@ -198,7 +198,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		String prefElementId = "Component";
+		String prefElementId = "Classifier";
 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
 		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
 		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
@@ -281,7 +281,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SubjectComponentNameEditPartTN.VISUAL_ID));
+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SubjectClassifierNameEditPartTN.VISUAL_ID));
 	}
 
 	/**
@@ -316,13 +316,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -355,13 +349,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -394,13 +382,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -451,13 +433,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -508,13 +484,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -565,13 +535,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -629,9 +593,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -643,9 +605,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -657,9 +617,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -677,9 +635,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -697,9 +653,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -717,9 +671,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -765,9 +717,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -779,9 +729,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -797,9 +745,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -820,9 +766,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -840,9 +784,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -860,9 +802,7 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -889,15 +829,15 @@ public class SubjectComponentEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
 			String prefColor = null;
 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);
+				prefColor = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_LINE);
 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);
+				prefColor = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_FONT);
 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);
+				prefColor = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_FILL);
 			}
 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);
+			String prefGradient = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_GRADIENT);
 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
 				result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectComponentNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierNameEditPartTN.java
index befd576b17c..d8a7bda2a6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectComponentNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierNameEditPartTN.java
@@ -68,7 +68,7 @@ import org.eclipse.ui.PlatformUI;
 /**
  * @generated
  */
-public class SubjectComponentNameEditPartTN extends PapyrusCompartmentEditPart implements ITextAwareEditPart {
+public class SubjectClassifierNameEditPartTN extends PapyrusCompartmentEditPart implements ITextAwareEditPart {
 
 	/**
 	 * @generated
@@ -112,7 +112,7 @@ public class SubjectComponentNameEditPartTN extends PapyrusCompartmentEditPart i
 	/**
 	 * @generated
 	 */
-	public SubjectComponentNameEditPartTN(View view) {
+	public SubjectClassifierNameEditPartTN(View view) {
 		super(view);
 	}
 
@@ -324,7 +324,7 @@ public class SubjectComponentNameEditPartTN extends PapyrusCompartmentEditPart i
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentNameEditPartTN.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Classifier_2015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierNameEditPartTN.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectEditPartTN.java
index 408e92c966f..9f61c7eccaf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectEditPartTN.java
@@ -35,7 +35,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.SubjectClassItemSemanticEditPolicyTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.SubjectItemSemanticEditPolicyTN;
 import org.eclipse.papyrus.uml.diagram.usecase.figure.SubjectFigure;
 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;
@@ -45,12 +45,12 @@ import org.eclipse.swt.graphics.Color;
 /**
  * @generated
  */
-public class SubjectClassEditPartTN extends NamedElementEditPart {
+public class SubjectEditPartTN extends NamedElementEditPart {
 
 	/**
 	 * @generated
 	 */
-	public static final int VISUAL_ID = 2020;
+	public static final int VISUAL_ID = 2015;
 
 	/**
 	 * @generated
@@ -65,7 +65,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 	/**
 	 * @generated
 	 */
-	public SubjectClassEditPartTN(View view) {
+	public SubjectEditPartTN(View view) {
 		super(view);
 	}
 
@@ -74,7 +74,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 	 */
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubjectClassItemSemanticEditPolicyTN());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubjectItemSemanticEditPolicyTN());
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());
 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
@@ -135,14 +135,14 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 	 * @generated
 	 */
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof SubjectClassNameEditPartTN) {
-			((SubjectClassNameEditPartTN)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if(childEditPart instanceof SubjectNameEditPartTN) {
+			((SubjectNameEditPartTN)childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof SubjectClassUsecasesEditPart) {
+		if(childEditPart instanceof SubjectComponentUsecasesEditPart) {
 			IFigure pane = getPrimaryShape().getUseCasesContainerFigure();
 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((SubjectClassUsecasesEditPart)childEditPart).getFigure());
+			pane.add(((SubjectComponentUsecasesEditPart)childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -152,13 +152,13 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 	 * @generated
 	 */
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof SubjectClassNameEditPartTN) {
+		if(childEditPart instanceof SubjectNameEditPartTN) {
 			return true;
 		}
-		if(childEditPart instanceof SubjectClassUsecasesEditPart) {
+		if(childEditPart instanceof SubjectComponentUsecasesEditPart) {
 			IFigure pane = getPrimaryShape().getUseCasesContainerFigure();
 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.remove(((SubjectClassUsecasesEditPart)childEditPart).getFigure());
+			pane.remove(((SubjectComponentUsecasesEditPart)childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -188,7 +188,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 	 * @generated
 	 */
 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof SubjectClassUsecasesEditPart) {
+		if(editPart instanceof SubjectComponentUsecasesEditPart) {
 			return getPrimaryShape().getUseCasesContainerFigure();
 		}
 		return getContentPane();
@@ -198,7 +198,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		String prefElementId = "Class";
+		String prefElementId = "Classifier";
 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
 		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
 		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
@@ -281,7 +281,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SubjectClassNameEditPartTN.VISUAL_ID));
+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SubjectNameEditPartTN.VISUAL_ID));
 	}
 
 	/**
@@ -316,13 +316,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -355,13 +349,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -394,13 +382,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -451,13 +433,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -508,13 +484,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -565,13 +535,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -629,9 +593,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -643,9 +605,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -657,9 +617,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -677,9 +635,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -697,9 +653,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -717,9 +671,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -765,9 +717,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -779,9 +729,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -797,9 +745,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -820,9 +766,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -840,9 +784,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -860,9 +802,7 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -889,15 +829,15 @@ public class SubjectClassEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
 			String prefColor = null;
 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_LINE);
+				prefColor = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_LINE);
 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FONT);
+				prefColor = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_FONT);
 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FILL);
+				prefColor = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_FILL);
 			}
 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
-			String prefGradient = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_GRADIENT);
+			String prefGradient = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_GRADIENT);
 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
 				result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectInterfaceEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectInterfaceEditPartTN.java
deleted file mode 100644
index 2ce9fc1b43f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectInterfaceEditPartTN.java
+++ /dev/null
@@ -1,913 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Shape;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.SubjectInterfaceItemSemanticEditPolicyTN;
-import org.eclipse.papyrus.uml.diagram.usecase.figure.SubjectFigure;
-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class SubjectInterfaceEditPartTN extends NamedElementEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2021;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public SubjectInterfaceEditPartTN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubjectInterfaceItemSemanticEditPolicyTN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * Papyrus codeGen
-	 * 
-	 * @generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new SubjectFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public SubjectFigure getPrimaryShape() {
-		return (SubjectFigure)primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof SubjectInterfaceNameEditPartTN) {
-			((SubjectInterfaceNameEditPartTN)childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if(childEditPart instanceof SubjectInterfaceUsecasesEditPart) {
-			IFigure pane = getPrimaryShape().getUseCasesContainerFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((SubjectInterfaceUsecasesEditPart)childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof SubjectInterfaceNameEditPartTN) {
-			return true;
-		}
-		if(childEditPart instanceof SubjectInterfaceUsecasesEditPart) {
-			IFigure pane = getPrimaryShape().getUseCasesContainerFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.remove(((SubjectInterfaceUsecasesEditPart)childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if(addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if(removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof SubjectInterfaceUsecasesEditPart) {
-			return getPrimaryShape().getUseCasesContainerFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		String prefElementId = "Interface";
-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * 
-	 * @param nodeShape
-	 *        instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if(nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if(contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if(primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		if(primaryShape instanceof Shape) {
-			((Shape)primaryShape).setLineWidth(width);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if(primaryShape instanceof Shape) {
-			((Shape)primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SubjectInterfaceNameEditPartTN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<IElementType> getMARelTypesOnSource() {
-		ArrayList<IElementType> types = new ArrayList<IElementType>(7);
-		types.add(UMLElementTypes.Generalization_4010);
-		types.add(UMLElementTypes.Association_4011);
-		types.add(UMLElementTypes.Dependency_4013);
-		types.add(UMLElementTypes.Abstraction_4015);
-		types.add(UMLElementTypes.Usage_4016);
-		types.add(UMLElementTypes.Realization_4017);
-		types.add(UMLElementTypes.PackageImport_4019);
-		return types;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {
-		LinkedList<IElementType> types = new LinkedList<IElementType>();
-		if(targetEditPart instanceof ActorEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof UseCaseEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof UseCaseInComponentEditPart) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof ComponentInComponentEditPart) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof ActorInComponentEditPart) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof ActorInPackageEditPart) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof UseCaseInPackageEditPart) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof ComponentInPackageEditPart) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof ActorEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof UseCaseEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof UseCaseInComponentEditPart) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof ComponentInComponentEditPart) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof ActorInComponentEditPart) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof ActorInPackageEditPart) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof UseCaseInPackageEditPart) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof ComponentInPackageEditPart) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof ActorEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof UseCaseEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof PackageEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof ConstraintEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof DefaultNamedElementEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof UseCaseInComponentEditPart) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof ComponentInComponentEditPart) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof ConstraintInComponentEditPart) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof ActorInComponentEditPart) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof ConstraintInPackageEditPart) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof ActorInPackageEditPart) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof UseCaseInPackageEditPart) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof ComponentInPackageEditPart) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof PackageEditPartCN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof ActorEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof UseCaseEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof PackageEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof ConstraintEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof DefaultNamedElementEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof UseCaseInComponentEditPart) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof ComponentInComponentEditPart) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof ConstraintInComponentEditPart) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof ActorInComponentEditPart) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof ConstraintInPackageEditPart) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof ActorInPackageEditPart) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof UseCaseInPackageEditPart) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof ComponentInPackageEditPart) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof PackageEditPartCN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof ActorEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof UseCaseEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof PackageEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof ConstraintEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof DefaultNamedElementEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof UseCaseInComponentEditPart) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof ComponentInComponentEditPart) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof ConstraintInComponentEditPart) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof ActorInComponentEditPart) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof ConstraintInPackageEditPart) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof ActorInPackageEditPart) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof UseCaseInPackageEditPart) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof ComponentInPackageEditPart) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof PackageEditPartCN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof ActorEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof UseCaseEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof PackageEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof ConstraintEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof DefaultNamedElementEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof UseCaseInComponentEditPart) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof ComponentInComponentEditPart) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof ConstraintInComponentEditPart) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof ActorInComponentEditPart) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof ConstraintInPackageEditPart) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof ActorInPackageEditPart) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof UseCaseInPackageEditPart) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof ComponentInPackageEditPart) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof PackageEditPartCN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof PackageEditPartTN) {
-			types.add(UMLElementTypes.PackageImport_4019);
-		}
-		if(targetEditPart instanceof PackageEditPartCN) {
-			types.add(UMLElementTypes.PackageImport_4019);
-		}
-		return types;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {
-		LinkedList<IElementType> types = new LinkedList<IElementType>();
-		if(relationshipType == UMLElementTypes.Generalization_4010) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-		} else if(relationshipType == UMLElementTypes.Association_4011) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-		} else if(relationshipType == UMLElementTypes.Dependency_4013) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.Package_2016);
-			types.add(UMLElementTypes.Constraint_2017);
-			types.add(UMLElementTypes.NamedElement_2022);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Constraint_3017);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Constraint_3010);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-			types.add(UMLElementTypes.Package_3014);
-		} else if(relationshipType == UMLElementTypes.Abstraction_4015) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.Package_2016);
-			types.add(UMLElementTypes.Constraint_2017);
-			types.add(UMLElementTypes.NamedElement_2022);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Constraint_3017);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Constraint_3010);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-			types.add(UMLElementTypes.Package_3014);
-		} else if(relationshipType == UMLElementTypes.Usage_4016) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.Package_2016);
-			types.add(UMLElementTypes.Constraint_2017);
-			types.add(UMLElementTypes.NamedElement_2022);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Constraint_3017);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Constraint_3010);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-			types.add(UMLElementTypes.Package_3014);
-		} else if(relationshipType == UMLElementTypes.Realization_4017) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.Package_2016);
-			types.add(UMLElementTypes.Constraint_2017);
-			types.add(UMLElementTypes.NamedElement_2022);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Constraint_3017);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Constraint_3010);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-			types.add(UMLElementTypes.Package_3014);
-		} else if(relationshipType == UMLElementTypes.PackageImport_4019) {
-			types.add(UMLElementTypes.Package_2016);
-			types.add(UMLElementTypes.Package_3014);
-		}
-		return types;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<IElementType> getMARelTypesOnTarget() {
-		ArrayList<IElementType> types = new ArrayList<IElementType>(8);
-		types.add(UMLElementTypes.Generalization_4010);
-		types.add(UMLElementTypes.Association_4011);
-		types.add(UMLElementTypes.ConstraintConstrainedElement_4012);
-		types.add(UMLElementTypes.Dependency_4013);
-		types.add(UMLElementTypes.CommentAnnotatedElement_4014);
-		types.add(UMLElementTypes.Abstraction_4015);
-		types.add(UMLElementTypes.Usage_4016);
-		types.add(UMLElementTypes.Realization_4017);
-		return types;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<IElementType> getMATypesForSource(IElementType relationshipType) {
-		LinkedList<IElementType> types = new LinkedList<IElementType>();
-		if(relationshipType == UMLElementTypes.Generalization_4010) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-		} else if(relationshipType == UMLElementTypes.Association_4011) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-		} else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4012) {
-			types.add(UMLElementTypes.Constraint_2017);
-			types.add(UMLElementTypes.Constraint_3017);
-			types.add(UMLElementTypes.Constraint_3010);
-		} else if(relationshipType == UMLElementTypes.Dependency_4013) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.Package_2016);
-			types.add(UMLElementTypes.Constraint_2017);
-			types.add(UMLElementTypes.NamedElement_2022);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Constraint_3017);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Constraint_3010);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-			types.add(UMLElementTypes.Package_3014);
-		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4014) {
-			types.add(UMLElementTypes.Comment_2018);
-			types.add(UMLElementTypes.Comment_3015);
-		} else if(relationshipType == UMLElementTypes.Abstraction_4015) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.Package_2016);
-			types.add(UMLElementTypes.Constraint_2017);
-			types.add(UMLElementTypes.NamedElement_2022);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Constraint_3017);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Constraint_3010);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-			types.add(UMLElementTypes.Package_3014);
-		} else if(relationshipType == UMLElementTypes.Usage_4016) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.Package_2016);
-			types.add(UMLElementTypes.Constraint_2017);
-			types.add(UMLElementTypes.NamedElement_2022);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Constraint_3017);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Constraint_3010);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-			types.add(UMLElementTypes.Package_3014);
-		} else if(relationshipType == UMLElementTypes.Realization_4017) {
-			types.add(UMLElementTypes.Actor_2011);
-			types.add(UMLElementTypes.Actor_2012);
-			types.add(UMLElementTypes.UseCase_2013);
-			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
-			types.add(UMLElementTypes.Package_2016);
-			types.add(UMLElementTypes.Constraint_2017);
-			types.add(UMLElementTypes.NamedElement_2022);
-			types.add(UMLElementTypes.UseCase_3009);
-			types.add(UMLElementTypes.Component_3016);
-			types.add(UMLElementTypes.Constraint_3017);
-			types.add(UMLElementTypes.Actor_3018);
-			types.add(UMLElementTypes.Constraint_3010);
-			types.add(UMLElementTypes.Actor_3011);
-			types.add(UMLElementTypes.UseCase_3012);
-			types.add(UMLElementTypes.Component_3013);
-			types.add(UMLElementTypes.Package_3014);
-		}
-		return types;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public Object getPreferredValue(EStructuralFeature feature) {
-		IPreferenceStore preferenceStore = (IPreferenceStore)getDiagramPreferencesHint().getPreferenceStore();
-		Object result = null;
-		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-			String prefColor = null;
-			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);
-			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);
-			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);
-			}
-			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
-		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);
-			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
-			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
-				result = new Integer(gradientPreferenceConverter.getTransparency());
-			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
-				result = gradientPreferenceConverter.getGradientData();
-			}
-		}
-		if(result == null) {
-			result = getStructuralFeatureValue(feature);
-		}
-		return result;
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectNameEditPartTN.java
index c3903f81f87..75e3ccaec34 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectNameEditPartTN.java
@@ -7,6 +7,7 @@ import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.RunnableWithResult;
@@ -45,11 +46,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;
 import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
@@ -69,7 +73,7 @@ public class SubjectNameEditPartTN extends PapyrusCompartmentEditPart implements
 	/**
 	 * @generated
 	 */
-	public static final int VISUAL_ID = 6038;
+	public static final int VISUAL_ID = 5019;
 
 	/**
 	 * @generated
@@ -210,6 +214,16 @@ public class SubjectNameEditPartTN extends PapyrusCompartmentEditPart implements
 	 * @generated
 	 */
 	protected Image getLabelIcon() {
+		EObject parserElement = getParserElement();
+		if(parserElement == null) {
+			return null;
+		}
+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
+		for(View view : views) {
+			if(NameLabelIconHelper.showLabelIcon(view)) {
+				return UMLElementTypes.getImage(parserElement.eClass());
+			}
+		}
 		return null;
 	}
 
@@ -310,7 +324,7 @@ public class SubjectNameEditPartTN extends PapyrusCompartmentEditPart implements
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_2021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectNameEditPartTN.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Classifier_2015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectNameEditPartTN.VISUAL_ID));
 		}
 		return parser;
 	}
@@ -698,6 +712,9 @@ public class SubjectNameEditPartTN extends PapyrusCompartmentEditPart implements
 				}
 			}
 		}
+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {
+			refreshLabel();
+		}
 		super.handleNotificationEvent(event);
 	}
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java
index 3e1c90739b6..f38aeb4bb9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java
@@ -61,18 +61,10 @@ public class UMLEditPartFactory implements EditPartFactory {
 				return new UseCaseAsRectangleEditPartTN(view);
 			case UseCaseAsRectangleNameEditPartTN.VISUAL_ID:
 				return new UseCaseAsRectangleNameEditPartTN(view);
-			case SubjectComponentEditPartTN.VISUAL_ID:
-				return new SubjectComponentEditPartTN(view);
-			case SubjectComponentNameEditPartTN.VISUAL_ID:
-				return new SubjectComponentNameEditPartTN(view);
-			case SubjectClassEditPartTN.VISUAL_ID:
-				return new SubjectClassEditPartTN(view);
-			case SubjectClassNameEditPartTN.VISUAL_ID:
-				return new SubjectClassNameEditPartTN(view);
-			case SubjectInterfaceEditPartTN.VISUAL_ID:
-				return new SubjectInterfaceEditPartTN(view);
-			case SubjectInterfaceNameEditPartTN.VISUAL_ID:
-				return new SubjectInterfaceNameEditPartTN(view);
+			case SubjectClassifierEditPartTN.VISUAL_ID:
+				return new SubjectClassifierEditPartTN(view);
+			case SubjectClassifierNameEditPartTN.VISUAL_ID:
+				return new SubjectClassifierNameEditPartTN(view);
 			case PackageEditPartTN.VISUAL_ID:
 				return new PackageEditPartTN(view);
 			case PackageNameEditPartTN.VISUAL_ID:
@@ -147,10 +139,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 				return new UseCasePointsInRectangleEditPart(view);
 			case SubjectComponentUsecasesEditPart.VISUAL_ID:
 				return new SubjectComponentUsecasesEditPart(view);
-			case SubjectClassUsecasesEditPart.VISUAL_ID:
-				return new SubjectClassUsecasesEditPart(view);
-			case SubjectInterfaceUsecasesEditPart.VISUAL_ID:
-				return new SubjectInterfaceUsecasesEditPart(view);
 			case UseCasePointsInComponentEditPart.VISUAL_ID:
 				return new UseCasePointsInComponentEditPart(view);
 			case ComponentUsecases2EditPart.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java
index c456d8cb23b..480a9672e22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java
@@ -358,13 +358,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -397,13 +391,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -436,13 +424,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -493,13 +475,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -550,13 +526,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -607,13 +577,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -681,9 +645,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -695,9 +657,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -709,9 +669,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -729,9 +687,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -749,9 +705,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -769,9 +723,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -829,9 +781,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -843,9 +793,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -861,9 +809,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -884,9 +830,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -904,9 +848,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -924,9 +866,7 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
index f882720dbd4..ffbbe5e0d39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
@@ -360,13 +360,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -399,13 +393,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -438,13 +426,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -495,13 +477,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -552,13 +528,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -609,13 +579,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -683,9 +647,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -697,9 +659,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -711,9 +671,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -731,9 +689,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -751,9 +707,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -771,9 +725,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -831,9 +783,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -845,9 +795,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -863,9 +811,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -886,9 +832,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -906,9 +850,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -926,9 +868,7 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
index 409da359ebb..7b8b19681ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
@@ -360,13 +360,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {
@@ -399,13 +393,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {
@@ -438,13 +426,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -495,13 +477,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -552,13 +528,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -609,13 +579,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -683,9 +647,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -697,9 +659,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -711,9 +671,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -731,9 +689,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -751,9 +707,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -771,9 +725,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -831,9 +783,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -845,9 +795,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -863,9 +811,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -886,9 +832,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -906,9 +850,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -926,9 +868,7 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
index 133f143fcfe..65c57732da7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
@@ -360,13 +360,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Generalization_4010);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Generalization_4010);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -399,13 +393,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Association_4011);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Association_4011);
 		}
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {
@@ -438,13 +426,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Dependency_4013);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Dependency_4013);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -495,13 +477,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Abstraction_4015);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Abstraction_4015);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -552,13 +528,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Usage_4016);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Usage_4016);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -609,13 +579,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			types.add(UMLElementTypes.Realization_4017);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
 			types.add(UMLElementTypes.Realization_4017);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
@@ -683,9 +647,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -697,9 +659,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -711,9 +671,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -731,9 +689,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -751,9 +707,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -771,9 +725,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -831,9 +783,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -845,9 +795,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.UseCase_3009);
 			types.add(UMLElementTypes.Component_3016);
 			types.add(UMLElementTypes.Actor_3018);
@@ -863,9 +811,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -886,9 +832,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -906,9 +850,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
@@ -926,9 +868,7 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Actor_2012);
 			types.add(UMLElementTypes.UseCase_2013);
 			types.add(UMLElementTypes.UseCase_2014);
-			types.add(UMLElementTypes.Component_2015);
-			types.add(UMLElementTypes.Class_2020);
-			types.add(UMLElementTypes.Interface_2021);
+			types.add(UMLElementTypes.Classifier_2015);
 			types.add(UMLElementTypes.Package_2016);
 			types.add(UMLElementTypes.Constraint_2017);
 			types.add(UMLElementTypes.NamedElement_2022);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassifierItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassifierItemSemanticEditPolicyTN.java
new file mode 100644
index 00000000000..dd5189753bb
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassifierItemSemanticEditPolicyTN.java
@@ -0,0 +1,186 @@
+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
+
+/**
+ * @generated
+ */
+public class SubjectClassifierItemSemanticEditPolicyTN extends UMLBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	public SubjectClassifierItemSemanticEditPolicyTN() {
+		super(UMLElementTypes.Classifier_2015);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		EObject selectedEObject = req.getElementToDestroy();
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
+		if(provider != null) {
+			// Retrieve delete command from the Element Edit service
+			ICommand deleteCommand = provider.getEditCommand(req);
+			if(deleteCommand != null) {
+				return new ICommandProxy(deleteCommand);
+			}
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
+		return command != null ? command : super.getCreateRelationshipCommand(req);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
+		if(UMLElementTypes.Generalization_4010 == req.getElementType()) {
+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Association_4011 == req.getElementType()) {
+			return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.ConstraintConstrainedElement_4012 == req.getElementType()) {
+			return null;
+		}
+		if(UMLElementTypes.Dependency_4013 == req.getElementType()) {
+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.CommentAnnotatedElement_4014 == req.getElementType()) {
+			return null;
+		}
+		if(UMLElementTypes.Abstraction_4015 == req.getElementType()) {
+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Usage_4016 == req.getElementType()) {
+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Realization_4017 == req.getElementType()) {
+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.PackageImport_4019 == req.getElementType()) {
+			return getGEFWrapper(new PackageImportCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
+		if(UMLElementTypes.Generalization_4010 == req.getElementType()) {
+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Association_4011 == req.getElementType()) {
+			return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.ConstraintConstrainedElement_4012 == req.getElementType()) {
+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Dependency_4013 == req.getElementType()) {
+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.CommentAnnotatedElement_4014 == req.getElementType()) {
+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Abstraction_4015 == req.getElementType()) {
+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Usage_4016 == req.getElementType()) {
+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Realization_4017 == req.getElementType()) {
+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.PackageImport_4019 == req.getElementType()) {
+			return null;
+		}
+		return null;
+	}
+
+	/**
+	 * Returns command to reorient EClass based link. New link target or source
+	 * should be the domain model element associated with this node.
+	 * 
+	 * @generated
+	 */
+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
+		switch(getVisualID(req)) {
+		case GeneralizationEditPart.VISUAL_ID:
+		case DependencyEditPart.VISUAL_ID:
+		case AbstractionEditPart.VISUAL_ID:
+		case UsageEditPart.VISUAL_ID:
+		case RealizationEditPart.VISUAL_ID:
+		case PackageImportEditPart.VISUAL_ID:
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
+			if(provider == null) {
+				return UnexecutableCommand.INSTANCE;
+			}
+			// Retrieve re-orient command from the Element Edit service
+			ICommand reorientCommand = provider.getEditCommand(req);
+			if(reorientCommand == null) {
+				return UnexecutableCommand.INSTANCE;
+			}
+			return getGEFWrapper(reorientCommand.reduce());
+		case AssociationEditPart.VISUAL_ID:
+			return getGEFWrapper(new AssociationReorientCommand(req));
+		}
+		return super.getReorientRelationshipCommand(req);
+	}
+
+	/**
+	 * Returns command to reorient EReference based link. New link target or source
+	 * should be the domain model element associated with this node.
+	 * 
+	 * @generated
+	 */
+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
+		switch(getVisualID(req)) {
+		case ConstraintConstrainedElementEditPart.VISUAL_ID:
+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+		case CommentAnnotatedElementEditPart.VISUAL_ID:
+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
+		}
+		return super.getReorientReferenceRelationshipCommand(req);
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesCanonicalEditPolicy.java
index 7bc529f6228..9e7b69a2c09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesCanonicalEditPolicy.java
@@ -72,7 +72,7 @@ public class SubjectComponentUsecasesCanonicalEditPolicy extends CanonicalEditPo
 	protected List getSemanticChildrenList() {
 		View viewObject = (View)getHost().getModel();
 		LinkedList<EObject> result = new LinkedList<EObject>();
-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentUsecases_7011SemanticChildren(viewObject);
+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassifierUsecases_7011SemanticChildren(viewObject);
 		for(UMLNodeDescriptor d : childDescriptors) {
 			result.add(d.getModelElement());
 		}
@@ -102,7 +102,7 @@ public class SubjectComponentUsecasesCanonicalEditPolicy extends CanonicalEditPo
 			return;
 		}
 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();
-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentUsecases_7011SemanticChildren((View)getHost().getModel());
+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassifierUsecases_7011SemanticChildren((View)getHost().getModel());
 		LinkedList<View> orphaned = new LinkedList<View>();
 		// we care to check only views we recognize as ours
 		LinkedList<View> knownViewChildren = new LinkedList<View>();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesItemSemanticEditPolicy.java
index 779428b84f7..ca294f3d706 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesItemSemanticEditPolicy.java
@@ -16,7 +16,7 @@ public class SubjectComponentUsecasesItemSemanticEditPolicy extends UMLBaseItemS
 	 * @generated
 	 */
 	public SubjectComponentUsecasesItemSemanticEditPolicy() {
-		super(UMLElementTypes.Component_2015);
+		super(UMLElementTypes.Classifier_2015);
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectItemSemanticEditPolicyTN.java
index cc1ec5510f5..2b7b397bfd5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectItemSemanticEditPolicyTN.java
@@ -37,13 +37,13 @@ import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
 /**
  * @generated
  */
-public class SubjectComponentItemSemanticEditPolicyTN extends UMLBaseItemSemanticEditPolicy {
+public class SubjectItemSemanticEditPolicyTN extends UMLBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
-	public SubjectComponentItemSemanticEditPolicyTN() {
-		super(UMLElementTypes.Component_2015);
+	public SubjectItemSemanticEditPolicyTN() {
+		super(UMLElementTypes.Classifier_2015);
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramCanonicalEditPolicy.java
index 4444ffdd35a..ab4c93d6969 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramCanonicalEditPolicy.java
@@ -76,9 +76,7 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;
@@ -144,9 +142,7 @@ public class UseCaseDiagramCanonicalEditPolicy extends CanonicalEditPolicy {
 		case ActorAsRectangleEditPartTN.VISUAL_ID:
 		case UseCaseEditPartTN.VISUAL_ID:
 		case UseCaseAsRectangleEditPartTN.VISUAL_ID:
-		case SubjectComponentEditPartTN.VISUAL_ID:
-		case SubjectClassEditPartTN.VISUAL_ID:
-		case SubjectInterfaceEditPartTN.VISUAL_ID:
+		case SubjectClassifierEditPartTN.VISUAL_ID:
 		case PackageEditPartTN.VISUAL_ID:
 		case ConstraintEditPartTN.VISUAL_ID:
 		case CommentEditPartTN.VISUAL_ID:
@@ -377,30 +373,10 @@ public class UseCaseDiagramCanonicalEditPolicy extends CanonicalEditPolicy {
 			}
 			break;
 		}
-		case SubjectComponentEditPartTN.VISUAL_ID:
+		case SubjectClassifierEditPartTN.VISUAL_ID:
 		{
 			if(!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(UMLDiagramUpdater.getComponent_2015ContainedLinks(view));
-			}
-			if(!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$
-				domain2NotationMap.put(view.getElement(), view);
-			}
-			break;
-		}
-		case SubjectClassEditPartTN.VISUAL_ID:
-		{
-			if(!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(UMLDiagramUpdater.getClass_2020ContainedLinks(view));
-			}
-			if(!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$
-				domain2NotationMap.put(view.getElement(), view);
-			}
-			break;
-		}
-		case SubjectInterfaceEditPartTN.VISUAL_ID:
-		{
-			if(!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(UMLDiagramUpdater.getInterface_2021ContainedLinks(view));
+				result.addAll(UMLDiagramUpdater.getClassifier_2015ContainedLinks(view));
 			}
 			if(!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$
 				domain2NotationMap.put(view.getElement(), view);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramItemSemanticEditPolicy.java
index e071ea269d5..bf34e07bb3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramItemSemanticEditPolicy.java
@@ -27,9 +27,7 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintCreateCom
 import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DefaultNamedElementCreateCommandTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageCreateCommandTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ShortCutDiagramCreateCommand;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.SubjectClassCreateCommandTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.SubjectComponentCreateCommandTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.SubjectInterfaceCreateCommandTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.SubjectClassifierCreateCommandTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseAsRectangleCreateCommandTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseCreateCommandTN;
 import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
@@ -62,14 +60,8 @@ public class UseCaseDiagramItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 		if(UMLElementTypes.UseCase_2014 == req.getElementType()) {
 			return getGEFWrapper(new UseCaseAsRectangleCreateCommandTN(req));
 		}
-		if(UMLElementTypes.Component_2015 == req.getElementType()) {
-			return getGEFWrapper(new SubjectComponentCreateCommandTN(req));
-		}
-		if(UMLElementTypes.Class_2020 == req.getElementType()) {
-			return getGEFWrapper(new SubjectClassCreateCommandTN(req));
-		}
-		if(UMLElementTypes.Interface_2021 == req.getElementType()) {
-			return getGEFWrapper(new SubjectInterfaceCreateCommandTN(req));
+		if(UMLElementTypes.Classifier_2015 == req.getElementType()) {
+			return getGEFWrapper(new SubjectClassifierCreateCommandTN(req));
 		}
 		if(UMLElementTypes.Package_2016 == req.getElementType()) {
 			return getGEFWrapper(new PackageCreateCommandTN(req));
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorSorter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorSorter.java
index 8a1c9ce67c9..f36cc3e7560 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorSorter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorSorter.java
@@ -24,7 +24,7 @@ public class UMLNavigatorSorter extends ViewerSorter {
 	/**
 	 * @generated
 	 */
-	private static final int GROUP_CATEGORY = 7021;
+	private static final int GROUP_CATEGORY = 7019;
 
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/Messages.java
index 57d2d810053..de88ca11aca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/Messages.java
@@ -491,16 +491,6 @@ public class Messages extends NLS {
 	/**
 	 * @generated
 	 */
-	public static String SubjectClassUsecasesEditPart_title;
-
-	/**
-	 * @generated
-	 */
-	public static String SubjectInterfaceUsecasesEditPart_title;
-
-	/**
-	 * @generated
-	 */
 	public static String UseCasePointsInComponentEditPart_title;
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdater.java
index b70d6eba397..3e650f00a73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdater.java
@@ -57,12 +57,8 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElem
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassUsecasesEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentUsecasesEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceUsecasesEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;
@@ -77,7 +73,6 @@ import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.Abstraction;
 import org.eclipse.uml2.uml.Actor;
 import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Comment;
 import org.eclipse.uml2.uml.Component;
@@ -88,7 +83,6 @@ import org.eclipse.uml2.uml.Extend;
 import org.eclipse.uml2.uml.ExtensionPoint;
 import org.eclipse.uml2.uml.Generalization;
 import org.eclipse.uml2.uml.Include;
-import org.eclipse.uml2.uml.Interface;
 import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Namespace;
 import org.eclipse.uml2.uml.Package;
@@ -118,11 +112,7 @@ public class UMLDiagramUpdater {
 		case UseCasePointsInRectangleEditPart.VISUAL_ID:
 			return getUseCasePoints_7010SemanticChildren(view);
 		case SubjectComponentUsecasesEditPart.VISUAL_ID:
-			return getComponentUsecases_7011SemanticChildren(view);
-		case SubjectClassUsecasesEditPart.VISUAL_ID:
-			return getClassUsecases_7018SemanticChildren(view);
-		case SubjectInterfaceUsecasesEditPart.VISUAL_ID:
-			return getInterfaceUsecases_7019SemanticChildren(view);
+			return getClassifierUsecases_7011SemanticChildren(view);
 		case UseCasePointsInComponentEditPart.VISUAL_ID:
 			return getUseCasePoints_7012SemanticChildren(view);
 		case ComponentUsecases2EditPart.VISUAL_ID:
@@ -190,7 +180,7 @@ public class UMLDiagramUpdater {
 	/**
 	 * @generated
 	 */
-	public static List<UMLNodeDescriptor> getComponentUsecases_7011SemanticChildren(View view) {
+	public static List<UMLNodeDescriptor> getClassifierUsecases_7011SemanticChildren(View view) {
 		if(false == view.eContainer() instanceof View) {
 			return Collections.emptyList();
 		}
@@ -198,87 +188,7 @@ public class UMLDiagramUpdater {
 		if(!containerView.isSetElement()) {
 			return Collections.emptyList();
 		}
-		Component modelElement = (Component)containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for(Iterator<?> it = modelElement.getUseCases().iterator(); it.hasNext();) {
-			UseCase childElement = (UseCase)it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if(visualID == UseCaseInComponentEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
-			Comment childElement = (Comment)it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if(visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint)it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if(visualID == ConstraintInComponentEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getClassUsecases_7018SemanticChildren(View view) {
-		if(false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View)view.eContainer();
-		if(!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Class modelElement = (Class)containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for(Iterator<?> it = modelElement.getUseCases().iterator(); it.hasNext();) {
-			UseCase childElement = (UseCase)it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if(visualID == UseCaseInComponentEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
-			Comment childElement = (Comment)it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if(visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint)it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if(visualID == ConstraintInComponentEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getInterfaceUsecases_7019SemanticChildren(View view) {
-		if(false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View)view.eContainer();
-		if(!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interface modelElement = (Interface)containerView.getElement();
+		Classifier modelElement = (Classifier)containerView.getElement();
 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
 		for(Iterator<?> it = modelElement.getUseCases().iterator(); it.hasNext();) {
 			UseCase childElement = (UseCase)it.next();
@@ -607,15 +517,7 @@ public class UMLDiagramUpdater {
 				result.add(new UMLNodeDescriptor(childElement, visualID));
 				continue;
 			}
-			if(visualID == SubjectComponentEditPartTN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if(visualID == SubjectClassEditPartTN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if(visualID == SubjectInterfaceEditPartTN.VISUAL_ID) {
+			if(visualID == SubjectClassifierEditPartTN.VISUAL_ID) {
 				result.add(new UMLNodeDescriptor(childElement, visualID));
 				continue;
 			}
@@ -680,12 +582,8 @@ public class UMLDiagramUpdater {
 			return getUseCase_2013ContainedLinks(view);
 		case UseCaseAsRectangleEditPartTN.VISUAL_ID:
 			return getUseCase_2014ContainedLinks(view);
-		case SubjectComponentEditPartTN.VISUAL_ID:
-			return getComponent_2015ContainedLinks(view);
-		case SubjectClassEditPartTN.VISUAL_ID:
-			return getClass_2020ContainedLinks(view);
-		case SubjectInterfaceEditPartTN.VISUAL_ID:
-			return getInterface_2021ContainedLinks(view);
+		case SubjectClassifierEditPartTN.VISUAL_ID:
+			return getClassifier_2015ContainedLinks(view);
 		case PackageEditPartTN.VISUAL_ID:
 			return getPackage_2016ContainedLinks(view);
 		case ConstraintEditPartTN.VISUAL_ID:
@@ -757,12 +655,8 @@ public class UMLDiagramUpdater {
 			return getUseCase_2013IncomingLinks(view);
 		case UseCaseAsRectangleEditPartTN.VISUAL_ID:
 			return getUseCase_2014IncomingLinks(view);
-		case SubjectComponentEditPartTN.VISUAL_ID:
-			return getComponent_2015IncomingLinks(view);
-		case SubjectClassEditPartTN.VISUAL_ID:
-			return getClass_2020IncomingLinks(view);
-		case SubjectInterfaceEditPartTN.VISUAL_ID:
-			return getInterface_2021IncomingLinks(view);
+		case SubjectClassifierEditPartTN.VISUAL_ID:
+			return getClassifier_2015IncomingLinks(view);
 		case PackageEditPartTN.VISUAL_ID:
 			return getPackage_2016IncomingLinks(view);
 		case ConstraintEditPartTN.VISUAL_ID:
@@ -834,12 +728,8 @@ public class UMLDiagramUpdater {
 			return getUseCase_2013OutgoingLinks(view);
 		case UseCaseAsRectangleEditPartTN.VISUAL_ID:
 			return getUseCase_2014OutgoingLinks(view);
-		case SubjectComponentEditPartTN.VISUAL_ID:
-			return getComponent_2015OutgoingLinks(view);
-		case SubjectClassEditPartTN.VISUAL_ID:
-			return getClass_2020OutgoingLinks(view);
-		case SubjectInterfaceEditPartTN.VISUAL_ID:
-			return getInterface_2021OutgoingLinks(view);
+		case SubjectClassifierEditPartTN.VISUAL_ID:
+			return getClassifier_2015OutgoingLinks(view);
 		case PackageEditPartTN.VISUAL_ID:
 			return getPackage_2016OutgoingLinks(view);
 		case ConstraintEditPartTN.VISUAL_ID:
@@ -965,30 +855,8 @@ public class UMLDiagramUpdater {
 	/**
 	 * @generated
 	 */
-	public static List<UMLLinkDescriptor> getComponent_2015ContainedLinks(View view) {
-		Component modelElement = (Component)view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4010(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4019(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getClass_2020ContainedLinks(View view) {
-		Class modelElement = (Class)view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4010(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4019(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterface_2021ContainedLinks(View view) {
-		Interface modelElement = (Interface)view.getElement();
+	public static List<UMLLinkDescriptor> getClassifier_2015ContainedLinks(View view) {
+		Classifier modelElement = (Classifier)view.getElement();
 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
 		result.addAll(getContainedTypeModelFacetLinks_Generalization_4010(modelElement));
 		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4019(modelElement));
@@ -1328,44 +1196,8 @@ public class UMLDiagramUpdater {
 	/**
 	 * @generated
 	 */
-	public static List<UMLLinkDescriptor> getComponent_2015IncomingLinks(View view) {
-		Component modelElement = (Component)view.getElement();
-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4010(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Association_4011(modelElement, crossReferences));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4012(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4013(modelElement, crossReferences));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4014(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4015(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4016(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4017(modelElement, crossReferences));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getClass_2020IncomingLinks(View view) {
-		Class modelElement = (Class)view.getElement();
-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4010(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Association_4011(modelElement, crossReferences));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4012(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4013(modelElement, crossReferences));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4014(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4015(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4016(modelElement, crossReferences));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4017(modelElement, crossReferences));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterface_2021IncomingLinks(View view) {
-		Interface modelElement = (Interface)view.getElement();
+	public static List<UMLLinkDescriptor> getClassifier_2015IncomingLinks(View view) {
+		Classifier modelElement = (Classifier)view.getElement();
 		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());
 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4010(modelElement, crossReferences));
@@ -1857,40 +1689,8 @@ public class UMLDiagramUpdater {
 	/**
 	 * @generated
 	 */
-	public static List<UMLLinkDescriptor> getComponent_2015OutgoingLinks(View view) {
-		Component modelElement = (Component)view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4010(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4011(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4013(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4015(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4016(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4017(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4019(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getClass_2020OutgoingLinks(View view) {
-		Class modelElement = (Class)view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4010(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4011(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4013(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4015(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4016(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4017(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4019(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterface_2021OutgoingLinks(View view) {
-		Interface modelElement = (Interface)view.getElement();
+	public static List<UMLLinkDescriptor> getClassifier_2015OutgoingLinks(View view) {
+		Classifier modelElement = (Classifier)view.getElement();
 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4010(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Association_4011(modelElement));
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLPaletteFactory.java
index d9069cdb9dc..49ab079d67b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLPaletteFactory.java
@@ -214,11 +214,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated
 	 */
 	private Tool createSubject2CreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(4);
-		types.add(UMLElementTypes.Component_2015);
+		List<IElementType> types = new ArrayList<IElementType>(2);
+		types.add(UMLElementTypes.Classifier_2015);
 		types.add(UMLElementTypes.Component_3013);
-		types.add(UMLElementTypes.Class_2020);
-		types.add(UMLElementTypes.Interface_2021);
 		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
 		return tool;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java
index 8f1bc9f4434..c1185ab65d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java
@@ -85,15 +85,9 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationAppliedSter
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationNameEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassNameEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassUsecasesEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentNameEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierNameEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentUsecasesEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceNameEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceUsecasesEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageNameEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;
@@ -229,14 +223,8 @@ public class UMLVisualIDRegistry {
 			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
 				return UseCaseAsRectangleEditPartTN.VISUAL_ID;
 			}
-			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return SubjectComponentEditPartTN.VISUAL_ID;
-			}
-			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return SubjectClassEditPartTN.VISUAL_ID;
-			}
-			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return SubjectInterfaceEditPartTN.VISUAL_ID;
+			if(UMLPackage.eINSTANCE.getClassifier().isSuperTypeOf(domainElement.eClass())) {
+				return SubjectClassifierEditPartTN.VISUAL_ID;
 			}
 			if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) {
 				return PackageEditPartTN.VISUAL_ID;
@@ -275,28 +263,6 @@ public class UMLVisualIDRegistry {
 				return ConstraintInComponentEditPart.VISUAL_ID;
 			}
 			break;
-		case SubjectClassUsecasesEditPart.VISUAL_ID:
-			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseInComponentEditPart.VISUAL_ID;
-			}
-			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintInComponentEditPart.VISUAL_ID;
-			}
-			break;
-		case SubjectInterfaceUsecasesEditPart.VISUAL_ID:
-			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseInComponentEditPart.VISUAL_ID;
-			}
-			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintInComponentEditPart.VISUAL_ID;
-			}
-			break;
 		case UseCasePointsInComponentEditPart.VISUAL_ID:
 			if(UMLPackage.eINSTANCE.getExtensionPoint().isSuperTypeOf(domainElement.eClass())) {
 				return ExtensionPointEditPart.VISUAL_ID;
@@ -417,13 +383,7 @@ public class UMLVisualIDRegistry {
 			if(UseCaseAsRectangleEditPartTN.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if(SubjectComponentEditPartTN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if(SubjectClassEditPartTN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if(SubjectInterfaceEditPartTN.VISUAL_ID == nodeVisualID) {
+			if(SubjectClassifierEditPartTN.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			if(PackageEditPartTN.VISUAL_ID == nodeVisualID) {
@@ -471,30 +431,14 @@ public class UMLVisualIDRegistry {
 				return true;
 			}
 			break;
-		case SubjectComponentEditPartTN.VISUAL_ID:
-			if(SubjectComponentNameEditPartTN.VISUAL_ID == nodeVisualID) {
+		case SubjectClassifierEditPartTN.VISUAL_ID:
+			if(SubjectClassifierNameEditPartTN.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			if(SubjectComponentUsecasesEditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			break;
-		case SubjectClassEditPartTN.VISUAL_ID:
-			if(SubjectClassNameEditPartTN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if(SubjectClassUsecasesEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case SubjectInterfaceEditPartTN.VISUAL_ID:
-			if(SubjectInterfaceNameEditPartTN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if(SubjectInterfaceUsecasesEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
 		case PackageEditPartTN.VISUAL_ID:
 			if(PackageNameEditPartTN.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -615,28 +559,6 @@ public class UMLVisualIDRegistry {
 				return true;
 			}
 			break;
-		case SubjectClassUsecasesEditPart.VISUAL_ID:
-			if(UseCaseInComponentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if(ConstraintInComponentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case SubjectInterfaceUsecasesEditPart.VISUAL_ID:
-			if(UseCaseInComponentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if(ConstraintInComponentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
 		case UseCasePointsInComponentEditPart.VISUAL_ID:
 			if(ExtensionPointEditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -917,11 +839,7 @@ public class UMLVisualIDRegistry {
 		root.addNode(1000, viewInfo);
 		viewInfo = new BaseViewInfo(2014, ViewInfo.Node, "UseCase");
 		root.addNode(1000, viewInfo);
-		viewInfo = new BaseViewInfo(2015, ViewInfo.Node, "Component");
-		root.addNode(1000, viewInfo);
-		viewInfo = new BaseViewInfo(2020, ViewInfo.Node, "Class");
-		root.addNode(1000, viewInfo);
-		viewInfo = new BaseViewInfo(2021, ViewInfo.Node, "Interface");
+		viewInfo = new BaseViewInfo(2015, ViewInfo.Node, "Classifier");
 		root.addNode(1000, viewInfo);
 		viewInfo = new BaseViewInfo(2016, ViewInfo.Node, "Package");
 		root.addNode(1000, viewInfo);
@@ -1001,8 +919,6 @@ public class UMLVisualIDRegistry {
 		root.addNode(7011, viewInfo);
 		root.addNode(7017, viewInfo);
 		root.addNode(7015, viewInfo);
-		root.addNode(7018, viewInfo);
-		root.addNode(7019, viewInfo);
 		viewInfo = new BaseViewInfo(3016, ViewInfo.Node, "Component");
 		root.addNode(7015, viewInfo);
 		root.addNode(7017, viewInfo);
@@ -1012,14 +928,10 @@ public class UMLVisualIDRegistry {
 		root.addNode(7016, viewInfo);
 		root.addNode(7011, viewInfo);
 		root.addNode(7013, viewInfo);
-		root.addNode(7018, viewInfo);
-		root.addNode(7019, viewInfo);
 		viewInfo = new BaseViewInfo(3017, ViewInfo.Node, "Constraint");
 		root.addNode(7017, viewInfo);
 		root.addNode(7015, viewInfo);
 		root.addNode(7011, viewInfo);
-		root.addNode(7018, viewInfo);
-		root.addNode(7019, viewInfo);
 		viewInfo = new BaseViewInfo(3018, ViewInfo.Node, "Actor");
 		root.addNode(7017, viewInfo);
 		root.addNode(7015, viewInfo);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramPreferenceInitializer.java
index 71a96514e1b..b433920e433 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramPreferenceInitializer.java
@@ -29,14 +29,13 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer
 		IPreferenceStore store = getPreferenceStore();
 		UseCasePreferencePage.initDefaults(store);
 		ShortCutDiagramPreferencePage.initDefaults(store);
+		ClassifierPreferencePage.initDefaults(store);
+		CommentPreferencePage.initDefaults(store);
 		ConstraintPreferencePage.initDefaults(store);
 		ActorPreferencePage.initDefaults(store);
 		ExtensionPointPreferencePage.initDefaults(store);
 		PackagePreferencePage.initDefaults(store);
 		ComponentPreferencePage.initDefaults(store);
-		CommentPreferencePage.initDefaults(store);
-		InterfacePreferencePage.initDefaults(store);
-		ClassPreferencePage.initDefaults(store);
 		DefaultNamedElementPreferencePage.initDefaults(store);
 		ExtendPreferencePage.initDefaults(store);
 		PackageMergePreferencePage.initDefaults(store);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java
index 9dbe4495fbb..9afc1992fd6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java
@@ -21,13 +21,12 @@ import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;
 import org.eclipse.uml2.uml.Abstraction;
 import org.eclipse.uml2.uml.Actor;
 import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Comment;
 import org.eclipse.uml2.uml.Component;
 import org.eclipse.uml2.uml.Constraint;
 import org.eclipse.uml2.uml.Dependency;
 import org.eclipse.uml2.uml.ExtensionPoint;
-import org.eclipse.uml2.uml.Interface;
 import org.eclipse.uml2.uml.OpaqueExpression;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Realization;
@@ -96,33 +95,9 @@ public class ElementInitializers {
 	/**
 	 * @generated
 	 */
-	public void init_Component_2015(Component instance) {
+	public void init_Classifier_2015(Classifier instance) {
 		try {
-			Object value_0 = name_Component_2015(instance);
-			instance.setName((String)value_0);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Class_2020(Class instance) {
-		try {
-			Object value_0 = name_Class_2020(instance);
-			instance.setName((String)value_0);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interface_2021(Interface instance) {
-		try {
-			Object value_0 = name_Interface_2021(instance);
+			Object value_0 = name_Classifier_2015(instance);
 			instance.setName((String)value_0);
 		} catch (RuntimeException e) {
 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
@@ -393,21 +368,7 @@ public class ElementInitializers {
 	/**
 	 * @generated
 	 */
-	private String name_Component_2015(Component self) {
-		return "Subject" + NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Class_2020(Class self) {
-		return "Subject" + NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interface_2021(Interface self) {
+	private String name_Classifier_2015(Classifier self) {
 		return "Subject" + NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());
 	}
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java
index 82b2242202f..fbcefecb735 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java
@@ -56,9 +56,7 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;
@@ -123,17 +121,7 @@ public class UMLElementTypes {
 	/**
 	 * @generated
 	 */
-	public static final IElementType Component_2015 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Component_2015"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Class_2020 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Class_2020"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interface_2021 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Interface_2021"); //$NON-NLS-1$
+	public static final IElementType Classifier_2015 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"); //$NON-NLS-1$
 
 	/**
 	 * @generated
@@ -390,9 +378,7 @@ public class UMLElementTypes {
 			elements.put(Actor_2012, UMLPackage.eINSTANCE.getActor());
 			elements.put(UseCase_2013, UMLPackage.eINSTANCE.getUseCase());
 			elements.put(UseCase_2014, UMLPackage.eINSTANCE.getUseCase());
-			elements.put(Component_2015, UMLPackage.eINSTANCE.getComponent());
-			elements.put(Class_2020, UMLPackage.eINSTANCE.getClass_());
-			elements.put(Interface_2021, UMLPackage.eINSTANCE.getInterface());
+			elements.put(Classifier_2015, UMLPackage.eINSTANCE.getClassifier());
 			elements.put(Package_2016, UMLPackage.eINSTANCE.getPackage());
 			elements.put(Constraint_2017, UMLPackage.eINSTANCE.getConstraint());
 			elements.put(Comment_2018, UMLPackage.eINSTANCE.getComment());
@@ -444,9 +430,7 @@ public class UMLElementTypes {
 			KNOWN_ELEMENT_TYPES.add(Actor_2012);
 			KNOWN_ELEMENT_TYPES.add(UseCase_2013);
 			KNOWN_ELEMENT_TYPES.add(UseCase_2014);
-			KNOWN_ELEMENT_TYPES.add(Component_2015);
-			KNOWN_ELEMENT_TYPES.add(Class_2020);
-			KNOWN_ELEMENT_TYPES.add(Interface_2021);
+			KNOWN_ELEMENT_TYPES.add(Classifier_2015);
 			KNOWN_ELEMENT_TYPES.add(Package_2016);
 			KNOWN_ELEMENT_TYPES.add(Constraint_2017);
 			KNOWN_ELEMENT_TYPES.add(Comment_2018);
@@ -495,12 +479,8 @@ public class UMLElementTypes {
 			return UseCase_2013;
 		case UseCaseAsRectangleEditPartTN.VISUAL_ID:
 			return UseCase_2014;
-		case SubjectComponentEditPartTN.VISUAL_ID:
-			return Component_2015;
-		case SubjectClassEditPartTN.VISUAL_ID:
-			return Class_2020;
-		case SubjectInterfaceEditPartTN.VISUAL_ID:
-			return Interface_2021;
+		case SubjectClassifierEditPartTN.VISUAL_ID:
+			return Classifier_2015;
 		case PackageEditPartTN.VISUAL_ID:
 			return Package_2016;
 		case ConstraintEditPartTN.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java
index e00ec01624e..4f0d13b46c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java
@@ -48,9 +48,7 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;
@@ -162,14 +160,8 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(sourceEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			return ((UseCaseAsRectangleEditPartTN)sourceEditPart).getMARelTypesOnSource();
 		}
-		if(sourceEditPart instanceof SubjectComponentEditPartTN) {
-			return ((SubjectComponentEditPartTN)sourceEditPart).getMARelTypesOnSource();
-		}
-		if(sourceEditPart instanceof SubjectClassEditPartTN) {
-			return ((SubjectClassEditPartTN)sourceEditPart).getMARelTypesOnSource();
-		}
-		if(sourceEditPart instanceof SubjectInterfaceEditPartTN) {
-			return ((SubjectInterfaceEditPartTN)sourceEditPart).getMARelTypesOnSource();
+		if(sourceEditPart instanceof SubjectClassifierEditPartTN) {
+			return ((SubjectClassifierEditPartTN)sourceEditPart).getMARelTypesOnSource();
 		}
 		if(sourceEditPart instanceof PackageEditPartTN) {
 			return ((PackageEditPartTN)sourceEditPart).getMARelTypesOnSource();
@@ -233,14 +225,8 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			return ((UseCaseAsRectangleEditPartTN)targetEditPart).getMARelTypesOnTarget();
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			return ((SubjectComponentEditPartTN)targetEditPart).getMARelTypesOnTarget();
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			return ((SubjectClassEditPartTN)targetEditPart).getMARelTypesOnTarget();
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
-			return ((SubjectInterfaceEditPartTN)targetEditPart).getMARelTypesOnTarget();
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
+			return ((SubjectClassifierEditPartTN)targetEditPart).getMARelTypesOnTarget();
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
 			return ((PackageEditPartTN)targetEditPart).getMARelTypesOnTarget();
@@ -305,14 +291,8 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(sourceEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			return ((UseCaseAsRectangleEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);
 		}
-		if(sourceEditPart instanceof SubjectComponentEditPartTN) {
-			return ((SubjectComponentEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);
-		}
-		if(sourceEditPart instanceof SubjectClassEditPartTN) {
-			return ((SubjectClassEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);
-		}
-		if(sourceEditPart instanceof SubjectInterfaceEditPartTN) {
-			return ((SubjectInterfaceEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);
+		if(sourceEditPart instanceof SubjectClassifierEditPartTN) {
+			return ((SubjectClassifierEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);
 		}
 		if(sourceEditPart instanceof PackageEditPartTN) {
 			return ((PackageEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);
@@ -376,14 +356,8 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			return ((UseCaseAsRectangleEditPartTN)targetEditPart).getMATypesForSource(relationshipType);
 		}
-		if(targetEditPart instanceof SubjectComponentEditPartTN) {
-			return ((SubjectComponentEditPartTN)targetEditPart).getMATypesForSource(relationshipType);
-		}
-		if(targetEditPart instanceof SubjectClassEditPartTN) {
-			return ((SubjectClassEditPartTN)targetEditPart).getMATypesForSource(relationshipType);
-		}
-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {
-			return ((SubjectInterfaceEditPartTN)targetEditPart).getMATypesForSource(relationshipType);
+		if(targetEditPart instanceof SubjectClassifierEditPartTN) {
+			return ((SubjectClassifierEditPartTN)targetEditPart).getMATypesForSource(relationshipType);
 		}
 		if(targetEditPart instanceof PackageEditPartTN) {
 			return ((PackageEditPartTN)targetEditPart).getMATypesForSource(relationshipType);
@@ -447,14 +421,8 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(sourceEditPart instanceof UseCaseAsRectangleEditPartTN) {
 			return ((UseCaseAsRectangleEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);
 		}
-		if(sourceEditPart instanceof SubjectComponentEditPartTN) {
-			return ((SubjectComponentEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);
-		}
-		if(sourceEditPart instanceof SubjectClassEditPartTN) {
-			return ((SubjectClassEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);
-		}
-		if(sourceEditPart instanceof SubjectInterfaceEditPartTN) {
-			return ((SubjectInterfaceEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);
+		if(sourceEditPart instanceof SubjectClassifierEditPartTN) {
+			return ((SubjectClassifierEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);
 		}
 		if(sourceEditPart instanceof PackageEditPartTN) {
 			return ((PackageEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
index cda8dc62516..2c3d446fb6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
@@ -63,9 +63,7 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartCN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationNameEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassNameEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentNameEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceNameEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierNameEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageNameEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart;
@@ -166,52 +164,18 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	/**
 	 * @generated
 	 */
-	private IParser componentName_5019Parser;
+	private IParser classifierName_5019Parser;
 
 	/**
 	 * @generated
 	 */
-	private IParser getComponentName_5019Parser() {
-		if(componentName_5019Parser == null) {
+	private IParser getClassifierName_5019Parser() {
+		if(classifierName_5019Parser == null) {
 			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };
 			MessageFormatParser parser = new MessageFormatParser(features);
-			componentName_5019Parser = parser;
+			classifierName_5019Parser = parser;
 		}
-		return componentName_5019Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser className_6037Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getClassName_6037Parser() {
-		if(className_6037Parser == null) {
-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			className_6037Parser = parser;
-		}
-		return className_6037Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interfaceName_6038Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterfaceName_6038Parser() {
-		if(interfaceName_6038Parser == null) {
-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interfaceName_6038Parser = parser;
-		}
-		return interfaceName_6038Parser;
+		return classifierName_5019Parser;
 	}
 
 	/**
@@ -779,12 +743,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			return getUseCaseName_5016Parser();
 		case UseCaseAsRectangleNameEditPartTN.VISUAL_ID:
 			return getUseCaseName_5017Parser();
-		case SubjectComponentNameEditPartTN.VISUAL_ID:
-			return getComponentName_5019Parser();
-		case SubjectClassNameEditPartTN.VISUAL_ID:
-			return getClassName_6037Parser();
-		case SubjectInterfaceNameEditPartTN.VISUAL_ID:
-			return getInterfaceName_6038Parser();
+		case SubjectClassifierNameEditPartTN.VISUAL_ID:
+			return getClassifierName_5019Parser();
 		case PackageNameEditPartTN.VISUAL_ID:
 			return getPackageName_5025Parser();
 		case ConstraintNameEditPartTN.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
index 7588cfd1154..aa7a28f5be7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
@@ -121,15 +121,9 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationAppliedSter
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationNameEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassNameEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassUsecasesEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentNameEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierNameEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentUsecasesEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceNameEditPartTN;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceUsecasesEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageNameEditPart;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;
@@ -251,9 +245,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				switch(visualID) {
 				case ActorEditPartTN.VISUAL_ID:
 				case UseCaseEditPartTN.VISUAL_ID:
-				case SubjectComponentEditPartTN.VISUAL_ID:
-				case SubjectClassEditPartTN.VISUAL_ID:
-				case SubjectInterfaceEditPartTN.VISUAL_ID:
+				case SubjectClassifierEditPartTN.VISUAL_ID:
 				case DefaultNamedElementEditPartTN.VISUAL_ID:
 				case ShortCutDiagramEditPart.VISUAL_ID:
 				case ExtensionPointEditPart.VISUAL_ID:
@@ -282,7 +274,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				}
 			}
 		}
-		return ActorEditPartTN.VISUAL_ID == visualID || ActorAsRectangleEditPartTN.VISUAL_ID == visualID || UseCaseEditPartTN.VISUAL_ID == visualID || UseCaseAsRectangleEditPartTN.VISUAL_ID == visualID || SubjectComponentEditPartTN.VISUAL_ID == visualID || SubjectClassEditPartTN.VISUAL_ID == visualID || SubjectInterfaceEditPartTN.VISUAL_ID == visualID || PackageEditPartTN.VISUAL_ID == visualID || ConstraintEditPartTN.VISUAL_ID == visualID || CommentEditPartTN.VISUAL_ID == visualID || DefaultNamedElementEditPartTN.VISUAL_ID == visualID || ShortCutDiagramEditPart.VISUAL_ID == visualID || ExtensionPointEditPart.VISUAL_ID == visualID || ExtensionPointInRectangleEditPart.VISUAL_ID == visualID || UseCaseInComponentEditPart.VISUAL_ID == visualID || ComponentInComponentEditPart.VISUAL_ID == visualID || CommentEditPartCN.VISUAL_ID == visualID || ConstraintInComponentEditPart.VISUAL_ID == visualID || ActorInComponentEditPart.VISUAL_ID == visualID || ConstraintInPackageEditPart.VISUAL_ID == visualID || ActorInPackageEditPart.VISUAL_ID == visualID || UseCaseInPackageEditPart.VISUAL_ID == visualID || ComponentInPackageEditPart.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID;
+		return ActorEditPartTN.VISUAL_ID == visualID || ActorAsRectangleEditPartTN.VISUAL_ID == visualID || UseCaseEditPartTN.VISUAL_ID == visualID || UseCaseAsRectangleEditPartTN.VISUAL_ID == visualID || SubjectClassifierEditPartTN.VISUAL_ID == visualID || PackageEditPartTN.VISUAL_ID == visualID || ConstraintEditPartTN.VISUAL_ID == visualID || CommentEditPartTN.VISUAL_ID == visualID || DefaultNamedElementEditPartTN.VISUAL_ID == visualID || ShortCutDiagramEditPart.VISUAL_ID == visualID || ExtensionPointEditPart.VISUAL_ID == visualID || ExtensionPointInRectangleEditPart.VISUAL_ID == visualID || UseCaseInComponentEditPart.VISUAL_ID == visualID || ComponentInComponentEditPart.VISUAL_ID == visualID || CommentEditPartCN.VISUAL_ID == visualID || ConstraintInComponentEditPart.VISUAL_ID == visualID || ActorInComponentEditPart.VISUAL_ID == visualID || ConstraintInPackageEditPart.VISUAL_ID == visualID || ActorInPackageEditPart.VISUAL_ID == visualID || UseCaseInPackageEditPart.VISUAL_ID == visualID || ComponentInPackageEditPart.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID;
 	}
 
 	/**
@@ -337,12 +329,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			return createUseCase_2013(domainElement, containerView, index, persisted, preferencesHint);
 		case UseCaseAsRectangleEditPartTN.VISUAL_ID:
 			return createUseCase_2014(domainElement, containerView, index, persisted, preferencesHint);
-		case SubjectComponentEditPartTN.VISUAL_ID:
-			return createComponent_2015(domainElement, containerView, index, persisted, preferencesHint);
-		case SubjectClassEditPartTN.VISUAL_ID:
-			return createClass_2020(domainElement, containerView, index, persisted, preferencesHint);
-		case SubjectInterfaceEditPartTN.VISUAL_ID:
-			return createInterface_2021(domainElement, containerView, index, persisted, preferencesHint);
+		case SubjectClassifierEditPartTN.VISUAL_ID:
+			return createClassifier_2015(domainElement, containerView, index, persisted, preferencesHint);
 		case PackageEditPartTN.VISUAL_ID:
 			return createPackage_2016(domainElement, containerView, index, persisted, preferencesHint);
 		case ConstraintEditPartTN.VISUAL_ID:
@@ -510,63 +498,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**
 	 * @generated
 	 */
-	public Node createComponent_2015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
+	public Node createClassifier_2015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
 		Shape node = NotationFactory.eINSTANCE.createShape();
 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(SubjectComponentEditPartTN.VISUAL_ID));
+		node.setType(UMLVisualIDRegistry.getType(SubjectClassifierEditPartTN.VISUAL_ID));
 		ViewUtil.insertChildView(containerView, node, index, persisted);
 		node.setElement(domainElement);
 		stampShortcut(containerView, node);
 		// initializeFromPreferences 
 		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Component");
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");
-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Component");
-		Node label5019 = createLabel(node, UMLVisualIDRegistry.getType(SubjectComponentNameEditPartTN.VISUAL_ID));
+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Classifier");
+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Classifier");
+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Classifier");
+		Node label5019 = createLabel(node, UMLVisualIDRegistry.getType(SubjectClassifierNameEditPartTN.VISUAL_ID));
 		createCompartment(node, UMLVisualIDRegistry.getType(SubjectComponentUsecasesEditPart.VISUAL_ID), false, false, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createClass_2020(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(SubjectClassEditPartTN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		stampShortcut(containerView, node);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Class");
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");
-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Class");
-		Node label6037 = createLabel(node, UMLVisualIDRegistry.getType(SubjectClassNameEditPartTN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(SubjectClassUsecasesEditPart.VISUAL_ID), false, false, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInterface_2021(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(SubjectInterfaceEditPartTN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		stampShortcut(containerView, node);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Interface");
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");
-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Interface");
-		Node label6038 = createLabel(node, UMLVisualIDRegistry.getType(SubjectInterfaceNameEditPartTN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(SubjectInterfaceUsecasesEditPart.VISUAL_ID), false, false, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interface");
+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Classifier");
 		return node;
 	}
author	ptessier	2012-04-13 08:34:04 +0000
committer	ptessier	2012-04-13 08:34:04 +0000
commit	cb120f756ec873270958c3833bfd19f90f7f3b81 (patch)
tree	8d28d5b87decfbe5bea320ac5db36c1f91fc4c7a /plugins
parent	569f8205f13309150b82d0bdb02d628f376b5185 (diff)
download	org.eclipse.papyrus-cb120f756ec873270958c3833bfd19f90f7f3b81.tar.gz org.eclipse.papyrus-cb120f756ec873270958c3833bfd19f90f7f3b81.tar.xz org.eclipse.papyrus-cb120f756ec873270958c3833bfd19f90f7f3b81.zip