diff --git a/edu.kit.ipd.descartes.mm.adaptation.edit/.classpath b/edu.kit.ipd.descartes.mm.adaptation.edit/.classpath
index 121e527a9386dd66bdd0ec178fc2d28d734b82f8..fb24f81843ea9fea4bd88210fb59799dc55d2a59 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.edit/.classpath
+++ b/edu.kit.ipd.descartes.mm.adaptation.edit/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-man"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/edu.kit.ipd.descartes.mm.adaptation.edit/src-man/edu/kit/ipd/descartes/mm/adaptation/provider/ActionReferenceItemProviderExtension.java b/edu.kit.ipd.descartes.mm.adaptation.edit/src-man/edu/kit/ipd/descartes/mm/adaptation/provider/ActionReferenceItemProviderExtension.java
new file mode 100644
index 0000000000000000000000000000000000000000..f2516f3b835622e87d630238e4efe336e56b0b9e
--- /dev/null
+++ b/edu.kit.ipd.descartes.mm.adaptation.edit/src-man/edu/kit/ipd/descartes/mm/adaptation/provider/ActionReferenceItemProviderExtension.java
@@ -0,0 +1,26 @@
+package edu.kit.ipd.descartes.mm.adaptation.provider;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+
+import edu.kit.ipd.descartes.mm.adaptation.Action;
+import edu.kit.ipd.descartes.mm.adaptation.ActionReference;
+
+public class ActionReferenceItemProviderExtension extends ActionReferenceItemProvider {
+
+    public ActionReferenceItemProviderExtension(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        Action ref = ((ActionReference)object).getRefersTo();
+        
+        String label = ref == null ? 
+            null : 
+            ref.getName();
+        
+        return label == null || label.length() == 0 ?
+            getString("_UI_ActionReference_type") :
+            getString("_UI_ActionReference_type") + " " + label;
+    }
+}
\ No newline at end of file
diff --git a/edu.kit.ipd.descartes.mm.adaptation.edit/src-man/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProviderExtension.java b/edu.kit.ipd.descartes.mm.adaptation.edit/src-man/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProviderExtension.java
new file mode 100644
index 0000000000000000000000000000000000000000..4dc942e09d21075c29b849a5956a9d3d2ef6672e
--- /dev/null
+++ b/edu.kit.ipd.descartes.mm.adaptation.edit/src-man/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProviderExtension.java
@@ -0,0 +1,32 @@
+package edu.kit.ipd.descartes.mm.adaptation.provider;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+
+import edu.kit.ipd.descartes.mm.adaptation.AdaptationActionOperation;
+import edu.kit.ipd.descartes.mm.adaptation.AdaptationDirection;
+import edu.kit.ipd.descartes.mm.adaptation.AdaptationScope;
+
+public class AdaptationActionOperationItemProviderExtension extends AdaptationActionOperationItemProvider {
+
+    public AdaptationActionOperationItemProviderExtension(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+        // TODO Auto-generated constructor stub
+    }
+
+    @Override
+    public String getText(Object object) {
+        AdaptationScope scopeLabelValue = ((AdaptationActionOperation)object).getAdaptationOperationScope();
+        AdaptationDirection directionLabelValue = ((AdaptationActionOperation)object).getAdaptationOperationDirection();
+        
+        String label;
+        if (scopeLabelValue == null || directionLabelValue == null)
+            label = null;
+        else
+            label = directionLabelValue.toString() + ", " + scopeLabelValue.toString();
+        
+        return label == null || label.length() == 0 ?
+            getString("_UI_AdaptationActionOperation_type") :
+            getString("_UI_AdaptationActionOperation_type") + " " + label;
+    }
+    
+}
diff --git a/edu.kit.ipd.descartes.mm.adaptation.edit/src-man/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationItemProviderAdapterFactoryExtension.java b/edu.kit.ipd.descartes.mm.adaptation.edit/src-man/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationItemProviderAdapterFactoryExtension.java
new file mode 100644
index 0000000000000000000000000000000000000000..63ac3f9d45660d456893f6e8c23ffa297fa83669
--- /dev/null
+++ b/edu.kit.ipd.descartes.mm.adaptation.edit/src-man/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationItemProviderAdapterFactoryExtension.java
@@ -0,0 +1,24 @@
+package edu.kit.ipd.descartes.mm.adaptation.provider;
+
+import org.eclipse.emf.common.notify.Adapter;
+
+public class AdaptationItemProviderAdapterFactoryExtension extends AdaptationItemProviderAdapterFactory {
+    
+    @Override
+    public Adapter createAdaptationActionOperationAdapter() {
+        if (adaptationActionOperationItemProvider == null) {
+            adaptationActionOperationItemProvider = new AdaptationActionOperationItemProviderExtension(this);
+        }
+
+        return adaptationActionOperationItemProvider;
+    }
+
+    @Override
+    public Adapter createActionReferenceAdapter() {
+        if (actionReferenceItemProvider == null) {
+            actionReferenceItemProvider = new ActionReferenceItemProviderExtension(this);
+        }
+            
+        return actionReferenceItemProvider;
+    }
+}
diff --git a/edu.kit.ipd.descartes.mm.adaptation.edit/src/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProvider.java b/edu.kit.ipd.descartes.mm.adaptation.edit/src/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProvider.java
index b436bf74468d1832bbeee5a4d08c09094e6fa57a..c7fbb4cdb6a3571681d9245dc08ef899dcaa7c3d 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.edit/src/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.adaptation.edit/src/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProvider.java
@@ -128,19 +128,12 @@ public class AdaptationActionOperationItemProvider
      * This returns the label text for the adapted class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated NOT
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        AdaptationScope scopeLabelValue = ((AdaptationActionOperation)object).getAdaptationOperationScope();
-        AdaptationDirection directionLabelValue = ((AdaptationActionOperation)object).getAdaptationOperationDirection();
-        
-        String label;
-        if (scopeLabelValue == null || directionLabelValue == null)
-            label = null;
-        else
-            label = directionLabelValue.toString() + ", " + scopeLabelValue.toString();
-        
+        AdaptationScope labelValue = ((AdaptationActionOperation)object).getAdaptationOperationScope();
+        String label = labelValue == null ? null : labelValue.toString();
         return label == null || label.length() == 0 ?
             getString("_UI_AdaptationActionOperation_type") :
             getString("_UI_AdaptationActionOperation_type") + " " + label;