diff --git a/src/languages/de.evoal.languages.model.instance/model/model.ecore b/src/languages/de.evoal.languages.model.instance/model/model.ecore
index 1dbd80a318ee3a71c2991d99ef20e39fbe38357e..75c469d3e0af8e3d6ce777832748392ab8f017c1 100644
--- a/src/languages/de.evoal.languages.model.instance/model/model.ecore
+++ b/src/languages/de.evoal.languages.model.instance/model/model.ecore
@@ -10,7 +10,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="Instance" eSuperTypes="#//Value">
     <eOperations name="findAttribute" eType="#//Attribute">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return getAttributes().stream().filter(n -> n.getName().equals(name)).findFirst().orElse(null);"/>
+        <details key="body" value="return this.getAttributes()&#xA;                 .stream()&#xA;                 .filter(n -> name.equals(((%de.evoal.languages.model.instance.Name%)n.getName()).getName().getName()))&#xA;                 .findFirst()&#xA;                 .orElse(null);"/>
       </eAnnotations>
       <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eOperations>
diff --git a/src/languages/de.evoal.languages.model.instance/model/model.genmodel b/src/languages/de.evoal.languages.model.instance/model/model.genmodel
index 9cba6c10d2cf49738195662999f1940a13bad289..039e514b63efa2526ec9a0735cc2664adb41ba34 100644
--- a/src/languages/de.evoal.languages.model.instance/model/model.genmodel
+++ b/src/languages/de.evoal.languages.model.instance/model/model.genmodel
@@ -11,7 +11,7 @@
     <genClasses ecoreClass="model.ecore#//Instance">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//Instance/name"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//Instance/attributes"/>
-      <genOperations ecoreOperation="model.ecore#//Instance/findAttribute" body="return getAttributes().stream().filter(n -> n.getName().equals(name)).findFirst().orElse(null);">
+      <genOperations ecoreOperation="model.ecore#//Instance/findAttribute" body="return this.getAttributes()&#xA;                 .stream()&#xA;                 .filter(n -> name.equals(((%de.evoal.languages.model.instance.Name%)n.getName()).getName().getName()))&#xA;                 .findFirst()&#xA;                 .orElse(null);">
         <genParameters ecoreParameter="model.ecore#//Instance/findAttribute/name"/>
       </genOperations>
     </genClasses>
diff --git a/src/languages/de.evoal.languages.model.instance/src-gen/de/evoal/languages/model/instance/impl/InstanceImpl.java b/src/languages/de.evoal.languages.model.instance/src-gen/de/evoal/languages/model/instance/impl/InstanceImpl.java
index 6ef572dd19dbb1695f229867f05aca771fc0774b..fd7bc71cbcd939d2e65e428e42a2541b711973fb 100644
--- a/src/languages/de.evoal.languages.model.instance/src-gen/de/evoal/languages/model/instance/impl/InstanceImpl.java
+++ b/src/languages/de.evoal.languages.model.instance/src-gen/de/evoal/languages/model/instance/impl/InstanceImpl.java
@@ -8,6 +8,7 @@ import de.evoal.languages.model.dl.TypeDefinition;
 import de.evoal.languages.model.instance.Attribute;
 import de.evoal.languages.model.instance.Instance;
 import de.evoal.languages.model.instance.InstancePackage;
+import de.evoal.languages.model.instance.Name;
 
 import java.util.Collection;
 
@@ -138,7 +139,11 @@ public class InstanceImpl extends ValueImpl implements Instance {
 	 */
 	@Override
 	public Attribute findAttribute(final String name) {
-		return getAttributes().stream().filter(n -> n.getName().equals(name)).findFirst().orElse(null);
+		return this.getAttributes()
+		                         .stream()
+		                         .filter(n -> name.equals(((Name)n.getName()).getName().getName()))
+		                         .findFirst()
+		                         .orElse(null);
 	}
 
 	/**