2 files changed, 9 insertions, 7 deletions

diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
index f9bad301..2fc15d94 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
@@ -4,7 +4,7 @@
     nsPrefix="cft">
   <eClassifiers xsi:type="ecore:EClass" name="ComponentDefinition">
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" upperBound="-1"
-        eType="#//IntputEvent" containment="true"/>
+        eType="#//InputEvent" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="eventDefinitions" upperBound="-1"
         eType="#//EventDefinition" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputEvents" upperBound="-1"
@@ -20,7 +20,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="distribution" lowerBound="1"
         eType="ecore:EClass ft.ecore#//Distribution" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IntputEvent" eSuperTypes="#//EventDeclaration">
+  <eClassifiers xsi:type="ecore:EClass" name="InputEvent" eSuperTypes="#//EventDeclaration">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EventDeclaration" abstract="true">
@@ -45,10 +45,11 @@
         eType="#//Output" containment="true" eOpposite="#//Output/component"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="componentDefinition" lowerBound="1"
         eType="#//ComponentDefinition"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Input">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="intputEvent" lowerBound="1"
-        eType="#//IntputEvent"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvent" lowerBound="1"
+        eType="#//InputEvent"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"
         eType="#//Component" eOpposite="#//Component/inputs"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="incomingConnections" upperBound="-1"
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
index 25b3cd39..635a2f46 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
@@ -20,8 +20,8 @@
     <genClasses ecoreClass="cft.ecore#//BasicEventDefinition">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//BasicEventDefinition/distribution"/>
     </genClasses>
-    <genClasses ecoreClass="cft.ecore#//IntputEvent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//IntputEvent/multiple"/>
+    <genClasses ecoreClass="cft.ecore#//InputEvent">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//InputEvent/multiple"/>
     </genClasses>
     <genClasses image="false" ecoreClass="cft.ecore#//EventDeclaration">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//EventDeclaration/name"/>
@@ -40,9 +40,10 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//Component/inputs"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//Component/outputs"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Component/componentDefinition"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//Component/name"/>
     </genClasses>
     <genClasses ecoreClass="cft.ecore#//Input">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Input/intputEvent"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Input/inputEvent"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference cft.ecore#//Input/component"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//Input/incomingConnections"/>
     </genClasses>