diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java
index fa80eebb5898f1bf104b57d74e8bb280b0c546e6..c1e8046b1eca49c2c968d85f4aa297aa9e16a81f 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java
@@ -4,15 +4,19 @@
 package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
 
 
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
 import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AbstractAction;
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
 /**
  * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AbstractAction} object.
@@ -21,7 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
  * @generated
  */
 public class AbstractActionItemProvider 
-	extends EntityItemProvider {
+	extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -66,10 +70,7 @@ public class AbstractActionItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AbstractAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AbstractAction_type") :
-			getString("_UI_AbstractAction_type") + " " + label;
+		return getString("_UI_AbstractAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java
index 4da59962b9a3c82267cbf59c5765f26c7f32182d..81b4a30a87a607ef84d6974d6f3eb36e5dd25f80 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java
@@ -4,15 +4,11 @@
 package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
 
 
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AcquireAction;
 import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
@@ -90,10 +86,7 @@ public class AcquireActionItemProvider extends AbstractActionItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AcquireAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AcquireAction_type") :
-			getString("_UI_AcquireAction_type") + " " + label;
+		return getString("_UI_AcquireAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java
index 695c92a44b0e5bf8e737f45afab10216b4ea3ced..00b55571789b51e51b4e0c710a39704ac394147e 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java
@@ -101,10 +101,7 @@ public class BranchActionItemProvider extends AbstractActionItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((BranchAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_BranchAction_type") :
-			getString("_UI_BranchAction_type") + " " + label;
+		return getString("_UI_BranchAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java
index bcd9d3911be0d7e3c95992abff1f43ec803bbfc0..c0cfc0eccaaf21ae8ef0a86ff4dfbd3e3f97c621 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java
@@ -100,10 +100,7 @@ public class ExternalCallActionItemProvider extends AbstractActionItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ExternalCallAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ExternalCallAction_type") :
-			getString("_UI_ExternalCallAction_type") + " " + label;
+		return getString("_UI_ExternalCallAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallItemProvider.java
index 0f66fe0d2850702bf65836303cc24ed00aab891c..22794cb6550bcaae7e503ce8381841606c98184e 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallItemProvider.java
@@ -4,26 +4,17 @@
 package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
 
 
+import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
 import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
+import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCall;
 import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
 /**
  * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCall} object.
@@ -32,13 +23,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
  * @generated
  */
 public class ExternalCallItemProvider 
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends EntityItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -129,7 +114,10 @@ public class ExternalCallItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ExternalCall_type");
+		String label = ((ExternalCall)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ExternalCall_type") :
+			getString("_UI_ExternalCall_type") + " " + label;
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java
index fa5700b8c714e3483a53933893089f64dccb3a85..365f04cd77f3416e68bdf7a80d259e6374801750 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java
@@ -125,10 +125,8 @@ public class ForkActionItemProvider extends AbstractActionItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ForkAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ForkAction_type") :
-			getString("_UI_ForkAction_type") + " " + label;
+		ForkAction forkAction = (ForkAction)object;
+		return getString("_UI_ForkAction_type") + " " + forkAction.isWithSynchronizationBarrier();
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java
index 5569a5a5b47b807d0aebc1fa0166f031f264ff50..1f122234ab36b93ae9eb76852cc972aaea579e04 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java
@@ -100,10 +100,7 @@ public class InternalActionItemProvider extends AbstractActionItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((InternalAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InternalAction_type") :
-			getString("_UI_InternalAction_type") + " " + label;
+		return getString("_UI_InternalAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java
index 0a3fc8d592b17c683c32108c248110afa44f5439..3dd1150f494de88e785757203e3b06af69bc83b9 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java
@@ -101,10 +101,7 @@ public class LoopActionItemProvider extends AbstractActionItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((LoopAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_LoopAction_type") :
-			getString("_UI_LoopAction_type") + " " + label;
+		return getString("_UI_LoopAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java
index 651ff4508709832d84c432f511ad8118eddfe8f7..a9148ee321a5a6d20a925df8861ccb0b2dfd3df8 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java
@@ -4,15 +4,11 @@
 package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
 
 
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ReleaseAction;
 import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
@@ -90,10 +86,7 @@ public class ReleaseActionItemProvider extends AbstractActionItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ReleaseAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ReleaseAction_type") :
-			getString("_UI_ReleaseAction_type") + " " + label;
+		return getString("_UI_ReleaseAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/AbstractUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/AbstractUserActionItemProvider.java
index 41b997ae29da825abaebf11e8b6e4695027e71d8..c7a5aaddbb4e1fe1a1a4454f72f5fea49d70785b 100644
--- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/AbstractUserActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/AbstractUserActionItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
  * @generated
  */
 public class AbstractUserActionItemProvider 
-	extends EntityItemProvider {
+	extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -63,10 +63,7 @@ public class AbstractUserActionItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AbstractUserAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AbstractUserAction_type") :
-			getString("_UI_AbstractUserAction_type") + " " + label;
+		return getString("_UI_AbstractUserAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/BranchUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/BranchUserActionItemProvider.java
index a5358c1cfde8a5760d32f068a2f41706764f8a59..3a06f42f3d07288c6e89f8e6dfbd82caca35c089 100644
--- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/BranchUserActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/BranchUserActionItemProvider.java
@@ -103,10 +103,7 @@ public class BranchUserActionItemProvider extends AbstractUserActionItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((BranchUserAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_BranchUserAction_type") :
-			getString("_UI_BranchUserAction_type") + " " + label;
+		return getString("_UI_BranchUserAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/DelayUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/DelayUserActionItemProvider.java
index 672309d1c0770fbf113199649d51ed18cbb77ca7..d4c658695f82f5f5028f3ce9b8520d9d77d02954 100644
--- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/DelayUserActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/DelayUserActionItemProvider.java
@@ -101,10 +101,7 @@ public class DelayUserActionItemProvider extends AbstractUserActionItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DelayUserAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DelayUserAction_type") :
-			getString("_UI_DelayUserAction_type") + " " + label;
+		return getString("_UI_DelayUserAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/LoopUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/LoopUserActionItemProvider.java
index 1f2dcbe4bdd5330c1cdb914ede2126411efb46c2..6c780ec6f58f2811f6cfb9bb61d42c62fe0f0f38 100644
--- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/LoopUserActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/LoopUserActionItemProvider.java
@@ -103,10 +103,7 @@ public class LoopUserActionItemProvider extends AbstractUserActionItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((LoopUserAction)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_LoopUserAction_type") :
-			getString("_UI_LoopUserAction_type") + " " + label;
+		return getString("_UI_LoopUserAction_type");
 	}
 	
 
diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/SystemCallUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/SystemCallUserActionItemProvider.java
index fe78a4c99f07b7b3061b7009a284fa09c6783bd0..2ff003d53dc0186f7b8cce1baa34f54f499266d8 100644
--- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/SystemCallUserActionItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/SystemCallUserActionItemProvider.java
@@ -4,6 +4,8 @@
 package edu.kit.ipd.descartes.mm.usageprofile.provider;
 
 
+import edu.kit.ipd.descartes.core.CorePackage;
+import edu.kit.ipd.descartes.identifier.IdentifierPackage;
 import edu.kit.ipd.descartes.mm.usageprofile.SystemCallUserAction;
 import edu.kit.ipd.descartes.mm.usageprofile.UsageProfileFactory;
 import edu.kit.ipd.descartes.mm.usageprofile.UsageProfilePackage;
@@ -18,6 +20,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
@@ -48,12 +51,58 @@ public class SystemCallUserActionItemProvider extends AbstractUserActionItemProv
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addIdPropertyDescriptor(object);
+			addNamePropertyDescriptor(object);
 			addProvidingRolePropertyDescriptor(object);
 			addSignaturePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
+	/**
+	 * This adds a property descriptor for the Id feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Identifier_id_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Identifier_id_feature", "_UI_Identifier_type"),
+				 IdentifierPackage.Literals.IDENTIFIER__ID,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_NamedElement_name_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_NamedElement_name_feature", "_UI_NamedElement_type"),
+				 CorePackage.Literals.NAMED_ELEMENT__NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
 	/**
 	 * This adds a property descriptor for the Providing Role feature.
 	 * <!-- begin-user-doc -->
@@ -166,6 +215,10 @@ public class SystemCallUserActionItemProvider extends AbstractUserActionItemProv
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(SystemCallUserAction.class)) {
+			case UsageProfilePackage.SYSTEM_CALL_USER_ACTION__ID:
+			case UsageProfilePackage.SYSTEM_CALL_USER_ACTION__NAME:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
 			case UsageProfilePackage.SYSTEM_CALL_USER_ACTION__INPUT_PARAMETER_SETTINGS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;