7 files changed, 198 insertions, 188 deletions

diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtextbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtextbin
index ffe22f72..eb879e93 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtextbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtextbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.g b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.g
index 2d1b9490..51479ad3 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.g
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.g
@@ -575,9 +575,9 @@ ruleConstantDistribution returns [EObject current=null]
         leaveRule();
 }:
         (
-                otherlv_0='p'
+                otherlv_0='prob'
                 {
-                        newLeafNode(otherlv_0, grammarAccess.getConstantDistributionAccess().getPKeyword_0());
+                        newLeafNode(otherlv_0, grammarAccess.getConstantDistributionAccess().getProbKeyword_0());
                 }
                 otherlv_1='='
                 {
@@ -1494,19 +1494,20 @@ ruleComponentInstance returns [EObject current=null]
                 )
                 (
                         (
-                                lv_name_2_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_2_0, grammarAccess.getComponentInstanceAccess().getNameIDTerminalRuleCall_2_0());
+                                        newCompositeNode(grammarAccess.getComponentInstanceAccess().getNameValidIdParserRuleCall_2_0());
                                 }
+                                lv_name_2_0=ruleValidId
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getComponentInstanceRule());
+                                                $current = createModelElementForParent(grammarAccess.getComponentInstanceRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_2_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )?
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.tokens b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.tokens
index 2183a28f..24a3b0ab 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.tokens
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.tokens
@@ -20,8 +20,8 @@
 'of'=27
 'or'=26
 'out'=19
-'p'=22
 'package'=13
+'prob'=22
 'toplevel'=29
 'transformation'=28
 '{'=17
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageLexer.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageLexer.java
index d7e9807d..c15c826a 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageLexer.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageLexer.java
@@ -255,10 +255,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:20:7: ( 'p' )
-            // InternalCftLanguage.g:20:9: 'p'
+            // InternalCftLanguage.g:20:7: ( 'prob' )
+            // InternalCftLanguage.g:20:9: 'prob'
             {
-            match('p'); 
+            match("prob"); 
+
 
             }
 
@@ -647,12 +648,12 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_OF_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1671:13: ( 'o' 'f' ( '0' .. '9' )+ )
-            // InternalCftLanguage.g:1671:15: 'o' 'f' ( '0' .. '9' )+
+            // InternalCftLanguage.g:1672:13: ( 'o' 'f' ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:1672:15: 'o' 'f' ( '0' .. '9' )+
             {
             match('o'); 
             match('f'); 
-            // InternalCftLanguage.g:1671:23: ( '0' .. '9' )+
+            // InternalCftLanguage.g:1672:23: ( '0' .. '9' )+
             int cnt1=0;
             loop1:
             do {
@@ -666,7 +667,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                 switch (alt1) {
                 case 1 :
-                    // InternalCftLanguage.g:1671:24: '0' .. '9'
+                    // InternalCftLanguage.g:1672:24: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -698,10 +699,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_T_DOUBLE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1673:15: ( ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ ) )
-            // InternalCftLanguage.g:1673:17: ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:1674:15: ( ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ ) )
+            // InternalCftLanguage.g:1674:17: ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
             {
-            // InternalCftLanguage.g:1673:17: ( '0' .. '9' )+
+            // InternalCftLanguage.g:1674:17: ( '0' .. '9' )+
             int cnt2=0;
             loop2:
             do {
@@ -715,7 +716,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                 switch (alt2) {
                 case 1 :
-                    // InternalCftLanguage.g:1673:18: '0' .. '9'
+                    // InternalCftLanguage.g:1674:18: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -731,15 +732,15 @@ public class InternalCftLanguageLexer extends Lexer {
                 cnt2++;
             } while (true);
 
-            // InternalCftLanguage.g:1673:29: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:1674:29: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
             int alt8=2;
             alt8 = dfa8.predict(input);
             switch (alt8) {
                 case 1 :
-                    // InternalCftLanguage.g:1673:30: '.' ( '0' .. '9' )+
+                    // InternalCftLanguage.g:1674:30: '.' ( '0' .. '9' )+
                     {
                     match('.'); 
-                    // InternalCftLanguage.g:1673:34: ( '0' .. '9' )+
+                    // InternalCftLanguage.g:1674:34: ( '0' .. '9' )+
                     int cnt3=0;
                     loop3:
                     do {
@@ -753,7 +754,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                         switch (alt3) {
                         case 1 :
-                            // InternalCftLanguage.g:1673:35: '0' .. '9'
+                            // InternalCftLanguage.g:1674:35: '0' .. '9'
                             {
                             matchRange('0','9'); 
 
@@ -773,9 +774,9 @@ public class InternalCftLanguageLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:1673:46: ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+                    // InternalCftLanguage.g:1674:46: ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
                     {
-                    // InternalCftLanguage.g:1673:46: ( '.' ( '0' .. '9' )+ )?
+                    // InternalCftLanguage.g:1674:46: ( '.' ( '0' .. '9' )+ )?
                     int alt5=2;
                     int LA5_0 = input.LA(1);
 
@@ -784,10 +785,10 @@ public class InternalCftLanguageLexer extends Lexer {
                     }
                     switch (alt5) {
                         case 1 :
-                            // InternalCftLanguage.g:1673:47: '.' ( '0' .. '9' )+
+                            // InternalCftLanguage.g:1674:47: '.' ( '0' .. '9' )+
                             {
                             match('.'); 
-                            // InternalCftLanguage.g:1673:51: ( '0' .. '9' )+
+                            // InternalCftLanguage.g:1674:51: ( '0' .. '9' )+
                             int cnt4=0;
                             loop4:
                             do {
@@ -801,7 +802,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                                 switch (alt4) {
                                 case 1 :
-                                    // InternalCftLanguage.g:1673:52: '0' .. '9'
+                                    // InternalCftLanguage.g:1674:52: '0' .. '9'
                                     {
                                     matchRange('0','9'); 
 
@@ -832,7 +833,7 @@ public class InternalCftLanguageLexer extends Lexer {
                         recover(mse);
                         throw mse;}
 
-                    // InternalCftLanguage.g:1673:75: ( '+' | '-' )?
+                    // InternalCftLanguage.g:1674:75: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -858,7 +859,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                     }
 
-                    // InternalCftLanguage.g:1673:86: ( '0' .. '9' )+
+                    // InternalCftLanguage.g:1674:86: ( '0' .. '9' )+
                     int cnt7=0;
                     loop7:
                     do {
@@ -872,7 +873,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                         switch (alt7) {
                         case 1 :
-                            // InternalCftLanguage.g:1673:87: '0' .. '9'
+                            // InternalCftLanguage.g:1674:87: '0' .. '9'
                             {
                             matchRange('0','9'); 
 
@@ -910,10 +911,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1675:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalCftLanguage.g:1675:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalCftLanguage.g:1676:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalCftLanguage.g:1676:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // InternalCftLanguage.g:1675:11: ( '^' )?
+            // InternalCftLanguage.g:1676:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -922,7 +923,7 @@ public class InternalCftLanguageLexer extends Lexer {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalCftLanguage.g:1675:11: '^'
+                    // InternalCftLanguage.g:1676:11: '^'
                     {
                     match('^'); 
 
@@ -940,7 +941,7 @@ public class InternalCftLanguageLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalCftLanguage.g:1675:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalCftLanguage.g:1676:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -989,10 +990,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1677:10: ( ( '0' .. '9' )+ )
-            // InternalCftLanguage.g:1677:12: ( '0' .. '9' )+
+            // InternalCftLanguage.g:1678:10: ( ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:1678:12: ( '0' .. '9' )+
             {
-            // InternalCftLanguage.g:1677:12: ( '0' .. '9' )+
+            // InternalCftLanguage.g:1678:12: ( '0' .. '9' )+
             int cnt11=0;
             loop11:
             do {
@@ -1006,7 +1007,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                 switch (alt11) {
                 case 1 :
-                    // InternalCftLanguage.g:1677:13: '0' .. '9'
+                    // InternalCftLanguage.g:1678:13: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -1038,10 +1039,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1679:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // InternalCftLanguage.g:1679:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalCftLanguage.g:1680:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalCftLanguage.g:1680:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // InternalCftLanguage.g:1679:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalCftLanguage.g:1680:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -1059,10 +1060,10 @@ public class InternalCftLanguageLexer extends Lexer {
             }
             switch (alt14) {
                 case 1 :
-                    // InternalCftLanguage.g:1679:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalCftLanguage.g:1680:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // InternalCftLanguage.g:1679:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalCftLanguage.g:1680:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop12:
                     do {
                         int alt12=3;
@@ -1078,7 +1079,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                         switch (alt12) {
                         case 1 :
-                            // InternalCftLanguage.g:1679:21: '\\\\' .
+                            // InternalCftLanguage.g:1680:21: '\\\\' .
                             {
                             match('\\'); 
                             matchAny(); 
@@ -1086,7 +1087,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalCftLanguage.g:1679:28: ~ ( ( '\\\\' | '\"' ) )
+                            // InternalCftLanguage.g:1680:28: ~ ( ( '\\\\' | '\"' ) )
                             {
                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                                 input.consume();
@@ -1111,10 +1112,10 @@ public class InternalCftLanguageLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:1679:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalCftLanguage.g:1680:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // InternalCftLanguage.g:1679:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalCftLanguage.g:1680:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -1130,7 +1131,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                         switch (alt13) {
                         case 1 :
-                            // InternalCftLanguage.g:1679:54: '\\\\' .
+                            // InternalCftLanguage.g:1680:54: '\\\\' .
                             {
                             match('\\'); 
                             matchAny(); 
@@ -1138,7 +1139,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalCftLanguage.g:1679:61: ~ ( ( '\\\\' | '\\'' ) )
+                            // InternalCftLanguage.g:1680:61: ~ ( ( '\\\\' | '\\'' ) )
                             {
                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                                 input.consume();
@@ -1181,12 +1182,12 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1681:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalCftLanguage.g:1681:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalCftLanguage.g:1682:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalCftLanguage.g:1682:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalCftLanguage.g:1681:24: ( options {greedy=false; } : . )*
+            // InternalCftLanguage.g:1682:24: ( options {greedy=false; } : . )*
             loop15:
             do {
                 int alt15=2;
@@ -1211,7 +1212,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                 switch (alt15) {
                 case 1 :
-                    // InternalCftLanguage.g:1681:52: .
+                    // InternalCftLanguage.g:1682:52: .
                     {
                     matchAny(); 
 
@@ -1241,12 +1242,12 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1683:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalCftLanguage.g:1683:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalCftLanguage.g:1684:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalCftLanguage.g:1684:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalCftLanguage.g:1683:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalCftLanguage.g:1684:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop16:
             do {
                 int alt16=2;
@@ -1259,7 +1260,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                 switch (alt16) {
                 case 1 :
-                    // InternalCftLanguage.g:1683:24: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalCftLanguage.g:1684:24: ~ ( ( '\\n' | '\\r' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -1279,7 +1280,7 @@ public class InternalCftLanguageLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalCftLanguage.g:1683:40: ( ( '\\r' )? '\\n' )?
+            // InternalCftLanguage.g:1684:40: ( ( '\\r' )? '\\n' )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -1288,9 +1289,9 @@ public class InternalCftLanguageLexer extends Lexer {
             }
             switch (alt18) {
                 case 1 :
-                    // InternalCftLanguage.g:1683:41: ( '\\r' )? '\\n'
+                    // InternalCftLanguage.g:1684:41: ( '\\r' )? '\\n'
                     {
-                    // InternalCftLanguage.g:1683:41: ( '\\r' )?
+                    // InternalCftLanguage.g:1684:41: ( '\\r' )?
                     int alt17=2;
                     int LA17_0 = input.LA(1);
 
@@ -1299,7 +1300,7 @@ public class InternalCftLanguageLexer extends Lexer {
                     }
                     switch (alt17) {
                         case 1 :
-                            // InternalCftLanguage.g:1683:41: '\\r'
+                            // InternalCftLanguage.g:1684:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1331,10 +1332,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1685:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalCftLanguage.g:1685:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCftLanguage.g:1686:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalCftLanguage.g:1686:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalCftLanguage.g:1685:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCftLanguage.g:1686:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt19=0;
             loop19:
             do {
@@ -1388,8 +1389,8 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1687:16: ( . )
-            // InternalCftLanguage.g:1687:18: .
+            // InternalCftLanguage.g:1688:16: ( . )
+            // InternalCftLanguage.g:1688:18: .
             {
             matchAny(); 
 
@@ -1725,24 +1726,24 @@ public class InternalCftLanguageLexer extends Lexer {
             this.transition = DFA8_transition;
         }
         public String getDescription() {
-            return "1673:29: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )";
+            return "1674:29: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )";
         }
     }
     static final String DFA20_eotS =
-        "\1\uffff\1\36\1\uffff\2\37\1\uffff\1\37\1\uffff\1\34\1\53\4\37\3\uffff\2\34\2\uffff\1\72\1\34\1\uffff\3\34\2\uffff\1\37\3\uffff\1\37\1\103\1\37\1\uffff\1\37\1\106\1\110\4\uffff\3\37\1\114\3\37\10\uffff\1\72\5\uffff\2\37\1\uffff\1\122\1\123\1\uffff\1\124\1\uffff\2\37\1\127\1\uffff\5\37\3\uffff\2\37\1\uffff\13\37\1\152\1\153\1\154\3\37\1\160\3\uffff\2\37\1\163\1\uffff\1\37\1\165\1\uffff\1\37\1\uffff\4\37\1\173\1\uffff";
+        "\1\uffff\1\37\1\uffff\2\37\1\uffff\1\37\1\uffff\1\34\1\53\4\37\3\uffff\2\34\2\uffff\1\74\1\34\1\uffff\3\34\2\uffff\2\37\2\uffff\1\37\1\104\1\37\1\uffff\1\37\1\107\1\110\4\uffff\3\37\1\115\3\37\10\uffff\1\74\5\uffff\3\37\1\uffff\1\124\1\125\2\uffff\1\126\2\37\1\131\1\uffff\4\37\1\136\1\37\3\uffff\2\37\1\uffff\4\37\1\uffff\7\37\1\155\1\156\1\157\3\37\1\163\3\uffff\2\37\1\166\1\uffff\1\37\1\170\1\uffff\1\37\1\uffff\4\37\1\176\1\uffff";
     static final String DFA20_eofS =
-        "\174\uffff";
+        "\177\uffff";
     static final String DFA20_minS =
-        "\1\0\1\60\1\uffff\1\155\1\146\1\uffff\1\146\1\uffff\1\135\1\76\1\141\1\156\1\157\1\141\3\uffff\2\75\2\uffff\1\56\1\101\1\uffff\2\0\1\52\2\uffff\1\143\3\uffff\1\160\1\60\1\164\1\uffff\1\164\2\60\4\uffff\1\155\1\157\1\144\1\60\1\141\2\160\10\uffff\1\56\5\uffff\1\153\1\157\1\uffff\2\60\1\uffff\1\60\1\uffff\1\142\1\153\1\60\1\uffff\1\156\1\154\1\160\1\141\1\162\3\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\60\1\157\1\145\1\147\1\60\3\uffff\1\162\1\154\1\60\1\uffff\1\155\1\60\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\60\1\uffff";
+        "\1\0\1\141\1\uffff\1\155\1\146\1\uffff\1\146\1\uffff\1\135\1\76\1\141\1\156\1\157\1\141\3\uffff\2\75\2\uffff\1\56\1\101\1\uffff\2\0\1\52\2\uffff\1\143\1\157\2\uffff\1\160\1\60\1\164\1\uffff\1\164\2\60\4\uffff\1\155\1\157\1\144\1\60\1\141\2\160\10\uffff\1\56\5\uffff\1\153\1\142\1\157\1\uffff\2\60\2\uffff\1\60\1\142\1\153\1\60\1\uffff\1\156\1\154\1\160\1\141\1\60\1\162\3\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\uffff\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\60\1\157\1\145\1\147\1\60\3\uffff\1\162\1\154\1\60\1\uffff\1\155\1\60\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\60\1\uffff";
     static final String DFA20_maxS =
-        "\1\uffff\1\172\1\uffff\1\156\1\146\1\uffff\1\165\1\uffff\1\135\1\76\1\157\1\163\1\162\1\141\3\uffff\2\75\2\uffff\1\145\1\172\1\uffff\2\uffff\1\57\2\uffff\1\143\3\uffff\1\160\1\172\1\164\1\uffff\1\164\2\172\4\uffff\1\155\1\157\1\144\1\172\1\141\2\160\10\uffff\1\145\5\uffff\1\153\1\157\1\uffff\2\172\1\uffff\1\172\1\uffff\1\142\1\153\1\172\1\uffff\1\156\1\154\1\160\1\141\1\162\3\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\172\1\157\1\145\1\147\1\172\3\uffff\1\162\1\154\1\172\1\uffff\1\155\1\172\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\172\1\uffff";
+        "\1\uffff\1\162\1\uffff\1\156\1\146\1\uffff\1\165\1\uffff\1\135\1\76\1\157\1\163\1\162\1\141\3\uffff\2\75\2\uffff\1\145\1\172\1\uffff\2\uffff\1\57\2\uffff\1\143\1\157\2\uffff\1\160\1\172\1\164\1\uffff\1\164\2\172\4\uffff\1\155\1\157\1\144\1\172\1\141\2\160\10\uffff\1\145\5\uffff\1\153\1\142\1\157\1\uffff\2\172\2\uffff\1\172\1\142\1\153\1\172\1\uffff\1\156\1\154\1\160\1\141\1\172\1\162\3\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\uffff\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\172\1\157\1\145\1\147\1\172\3\uffff\1\162\1\154\1\172\1\uffff\1\155\1\172\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\172\1\uffff";
     static final String DFA20_acceptS =
-        "\2\uffff\1\2\2\uffff\1\5\1\uffff\1\10\6\uffff\1\23\1\24\1\25\2\uffff\1\32\1\34\2\uffff\1\37\3\uffff\1\44\1\45\1\uffff\1\12\1\37\1\2\3\uffff\1\5\3\uffff\1\10\1\11\1\33\1\13\7\uffff\1\23\1\24\1\25\1\30\1\31\1\32\1\34\1\40\1\uffff\1\36\1\41\1\42\1\43\1\44\2\uffff\1\6\2\uffff\1\16\1\uffff\1\17\3\uffff\1\27\5\uffff\1\4\1\7\1\35\2\uffff\1\15\22\uffff\1\3\1\14\1\26\3\uffff\1\1\2\uffff\1\22\1\uffff\1\21\5\uffff\1\20";
+        "\2\uffff\1\2\2\uffff\1\5\1\uffff\1\10\6\uffff\1\23\1\24\1\25\2\uffff\1\32\1\34\2\uffff\1\37\3\uffff\1\44\1\45\2\uffff\1\37\1\2\3\uffff\1\5\3\uffff\1\10\1\11\1\33\1\13\7\uffff\1\23\1\24\1\25\1\30\1\31\1\32\1\34\1\36\1\uffff\1\40\1\41\1\42\1\43\1\44\3\uffff\1\6\2\uffff\1\16\1\17\4\uffff\1\27\6\uffff\1\4\1\7\1\35\2\uffff\1\15\4\uffff\1\12\16\uffff\1\3\1\14\1\26\3\uffff\1\1\2\uffff\1\22\1\uffff\1\21\5\uffff\1\20";
     static final String DFA20_specialS =
-        "\1\1\27\uffff\1\2\1\0\142\uffff}>";
+        "\1\1\27\uffff\1\2\1\0\145\uffff}>";
     static final String[] DFA20_transitionS = {
             "\11\34\2\33\2\34\1\33\22\34\1\33\1\34\1\30\4\34\1\31\1\16\1\20\1\24\1\21\1\17\1\34\1\23\1\32\12\25\1\22\1\2\1\34\1\11\3\34\32\27\1\10\2\34\1\26\1\27\1\34\1\13\1\27\1\4\5\27\1\3\2\27\1\12\1\15\1\27\1\6\1\1\3\27\1\14\6\27\1\5\1\34\1\7\uff82\34",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\1\35\31\37",
+            "\1\35\20\uffff\1\36",
             "",
             "\1\41\1\42",
             "\1\43",
@@ -1762,7 +1763,7 @@ public class InternalCftLanguageLexer extends Lexer {
             "\1\67",
             "",
             "",
-            "\1\74\1\uffff\12\73\13\uffff\1\74\37\uffff\1\74",
+            "\1\72\1\uffff\12\73\13\uffff\1\72\37\uffff\1\72",
             "\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
             "\0\75",
@@ -1771,27 +1772,27 @@ public class InternalCftLanguageLexer extends Lexer {
             "",
             "",
             "\1\101",
+            "\1\102",
             "",
             "",
-            "",
-            "\1\102",
+            "\1\103",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\104",
-            "",
             "\1\105",
+            "",
+            "\1\106",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\107\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\12\111\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
             "",
             "",
             "",
-            "\1\111",
             "\1\112",
             "\1\113",
+            "\1\114",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\115",
             "\1\116",
             "\1\117",
+            "\1\120",
             "",
             "",
             "",
@@ -1800,69 +1801,72 @@ public class InternalCftLanguageLexer extends Lexer {
             "",
             "",
             "",
-            "\1\74\1\uffff\12\73\13\uffff\1\74\37\uffff\1\74",
+            "\1\72\1\uffff\12\73\13\uffff\1\72\37\uffff\1\72",
             "",
             "",
             "",
             "",
             "",
-            "\1\120",
             "\1\121",
+            "\1\122",
+            "\1\123",
             "",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
-            "\12\107\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
-            "\1\125",
-            "\1\126",
+            "\12\111\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\1\127",
+            "\1\130",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
-            "\1\130",
-            "\1\131",
             "\1\132",
             "\1\133",
             "\1\134",
+            "\1\135",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\1\137",
             "",
             "",
             "",
-            "\1\135",
-            "\1\136",
-            "",
-            "\1\137",
             "\1\140",
             "\1\141",
+            "",
             "\1\142",
             "\1\143",
             "\1\144",
             "\1\145",
+            "",
             "\1\146",
             "\1\147",
             "\1\150",
             "\1\151",
+            "\1\152",
+            "\1\153",
+            "\1\154",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\155",
-            "\1\156",
-            "\1\157",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "",
-            "",
+            "\1\160",
             "\1\161",
             "\1\162",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
+            "",
+            "",
             "\1\164",
+            "\1\165",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
-            "\1\166",
-            "",
             "\1\167",
-            "\1\170",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "",
             "\1\171",
+            "",
             "\1\172",
+            "\1\173",
+            "\1\174",
+            "\1\175",
             "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             ""
     };
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageParser.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageParser.java
index 4727763e..0da9c0f1 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageParser.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageParser.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_OF_INT", "RULE_ID", "RULE_T_DOUBLE", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "';'", "'import'", "'cft'", "'{'", "'in'", "'out'", "'}'", "'[]'", "'p'", "'='", "'lambda'", "'and'", "'or'", "'of'", "'transformation'", "'toplevel'", "'mapping'", "'('", "','", "')'", "'lookup'", "'as'", "'+='", "':='", "'.'", "'=>'", "'*'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_OF_INT", "RULE_ID", "RULE_T_DOUBLE", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "';'", "'import'", "'cft'", "'{'", "'in'", "'out'", "'}'", "'[]'", "'prob'", "'='", "'lambda'", "'and'", "'or'", "'of'", "'transformation'", "'toplevel'", "'mapping'", "'('", "','", "')'", "'lookup'", "'as'", "'+='", "':='", "'.'", "'=>'", "'*'"
     };
     public static final int RULE_STRING=8;
     public static final int RULE_SL_COMMENT=10;
@@ -1549,7 +1549,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleConstantDistribution"
-    // InternalCftLanguage.g:570:1: ruleConstantDistribution returns [EObject current=null] : (otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) ) ;
+    // InternalCftLanguage.g:570:1: ruleConstantDistribution returns [EObject current=null] : (otherlv_0= 'prob' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) ) ;
     public final EObject ruleConstantDistribution() throws RecognitionException {
         EObject current = null;
 
@@ -1562,15 +1562,15 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:576:2: ( (otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) ) )
-            // InternalCftLanguage.g:577:2: (otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) )
+            // InternalCftLanguage.g:576:2: ( (otherlv_0= 'prob' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) ) )
+            // InternalCftLanguage.g:577:2: (otherlv_0= 'prob' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) )
             {
-            // InternalCftLanguage.g:577:2: (otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) )
-            // InternalCftLanguage.g:578:3: otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) )
+            // InternalCftLanguage.g:577:2: (otherlv_0= 'prob' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) )
+            // InternalCftLanguage.g:578:3: otherlv_0= 'prob' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) )
             {
             otherlv_0=(Token)match(input,22,FOLLOW_15); 
 
-                                newLeafNode(otherlv_0, grammarAccess.getConstantDistributionAccess().getPKeyword_0());
+                                newLeafNode(otherlv_0, grammarAccess.getConstantDistributionAccess().getProbKeyword_0());
                         
             otherlv_1=(Token)match(input,23,FOLLOW_16); 
 
@@ -3861,22 +3861,23 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleComponentInstance"
-    // InternalCftLanguage.g:1467:1: ruleComponentInstance returns [EObject current=null] : (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? ) ;
+    // InternalCftLanguage.g:1467:1: ruleComponentInstance returns [EObject current=null] : (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= ruleValidId ) )? ) ;
     public final EObject ruleComponentInstance() throws RecognitionException {
         EObject current = null;
 
         Token otherlv_0=null;
-        Token lv_name_2_0=null;
+        AntlrDatatypeRuleToken lv_name_2_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1473:2: ( (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? ) )
-            // InternalCftLanguage.g:1474:2: (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? )
+            // InternalCftLanguage.g:1473:2: ( (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= ruleValidId ) )? ) )
+            // InternalCftLanguage.g:1474:2: (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= ruleValidId ) )? )
             {
-            // InternalCftLanguage.g:1474:2: (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? )
-            // InternalCftLanguage.g:1475:3: otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )?
+            // InternalCftLanguage.g:1474:2: (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= ruleValidId ) )? )
+            // InternalCftLanguage.g:1475:3: otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= ruleValidId ) )?
             {
             otherlv_0=(Token)match(input,39,FOLLOW_3); 
 
@@ -3896,7 +3897,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                                                 newCompositeNode(grammarAccess.getComponentInstanceAccess().getComponentTypeComponentDefinitionCrossReference_1_0());
                                         
-            pushFollow(FOLLOW_33);
+            pushFollow(FOLLOW_18);
             ruleQualifiedName();
 
             state._fsp--;
@@ -3910,33 +3911,38 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalCftLanguage.g:1495:3: ( (lv_name_2_0= RULE_ID ) )?
+            // InternalCftLanguage.g:1495:3: ( (lv_name_2_0= ruleValidId ) )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
-            if ( (LA26_0==RULE_ID) ) {
+            if ( ((LA26_0>=RULE_OF_INT && LA26_0<=RULE_ID)) ) {
                 alt26=1;
             }
             switch (alt26) {
                 case 1 :
-                    // InternalCftLanguage.g:1496:4: (lv_name_2_0= RULE_ID )
+                    // InternalCftLanguage.g:1496:4: (lv_name_2_0= ruleValidId )
                     {
-                    // InternalCftLanguage.g:1496:4: (lv_name_2_0= RULE_ID )
-                    // InternalCftLanguage.g:1497:5: lv_name_2_0= RULE_ID
+                    // InternalCftLanguage.g:1496:4: (lv_name_2_0= ruleValidId )
+                    // InternalCftLanguage.g:1497:5: lv_name_2_0= ruleValidId
                     {
-                    lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-                                                        newLeafNode(lv_name_2_0, grammarAccess.getComponentInstanceAccess().getNameIDTerminalRuleCall_2_0());
+                                                        newCompositeNode(grammarAccess.getComponentInstanceAccess().getNameValidIdParserRuleCall_2_0());
                                                 
+                    pushFollow(FOLLOW_2);
+                    lv_name_2_0=ruleValidId();
+
+                    state._fsp--;
+
 
                                                         if (current==null) {
-                                                                current = createModelElement(grammarAccess.getComponentInstanceRule());
+                                                                current = createModelElementForParent(grammarAccess.getComponentInstanceRule());
                                                         }
-                                                        setWithLastConsumed(
+                                                        set(
                                                                 current,
                                                                 "name",
                                                                 lv_name_2_0,
-                                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                                        afterParserOrEnumRuleCall();
                                                 
 
                     }
@@ -3970,7 +3976,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalCftLanguage.g:1517:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalCftLanguage.g:1518:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -3978,8 +3984,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:1517:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // InternalCftLanguage.g:1518:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalCftLanguage.g:1518:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalCftLanguage.g:1519:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
              newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -4006,7 +4012,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalCftLanguage.g:1524:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* ) ;
+    // InternalCftLanguage.g:1525:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4020,16 +4026,16 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1530:2: ( (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* ) )
-            // InternalCftLanguage.g:1531:2: (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* )
+            // InternalCftLanguage.g:1531:2: ( (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* ) )
+            // InternalCftLanguage.g:1532:2: (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* )
             {
-            // InternalCftLanguage.g:1531:2: (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* )
-            // InternalCftLanguage.g:1532:3: this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )*
+            // InternalCftLanguage.g:1532:2: (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* )
+            // InternalCftLanguage.g:1533:3: this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )*
             {
 
                                 newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_0());
                         
-            pushFollow(FOLLOW_34);
+            pushFollow(FOLLOW_33);
             this_ValidId_0=ruleValidId();
 
             state._fsp--;
@@ -4040,7 +4046,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                                 afterParserOrEnumRuleCall();
                         
-            // InternalCftLanguage.g:1542:3: (kw= '.' this_ValidId_2= ruleValidId )*
+            // InternalCftLanguage.g:1543:3: (kw= '.' this_ValidId_2= ruleValidId )*
             loop27:
             do {
                 int alt27=2;
@@ -4059,7 +4065,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                 switch (alt27) {
                 case 1 :
-                    // InternalCftLanguage.g:1543:4: kw= '.' this_ValidId_2= ruleValidId
+                    // InternalCftLanguage.g:1544:4: kw= '.' this_ValidId_2= ruleValidId
                     {
                     kw=(Token)match(input,38,FOLLOW_3); 
 
@@ -4069,7 +4075,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                                                 newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_1_1());
                                         
-                    pushFollow(FOLLOW_34);
+                    pushFollow(FOLLOW_33);
                     this_ValidId_2=ruleValidId();
 
                     state._fsp--;
@@ -4112,7 +4118,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // InternalCftLanguage.g:1563:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
+    // InternalCftLanguage.g:1564:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
     public final String entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         String current = null;
 
@@ -4120,8 +4126,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:1563:65: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
-            // InternalCftLanguage.g:1564:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
+            // InternalCftLanguage.g:1564:65: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
+            // InternalCftLanguage.g:1565:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
             {
              newCompositeNode(grammarAccess.getQualifiedNameWithWildcardRule()); 
             pushFollow(FOLLOW_1);
@@ -4148,7 +4154,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // InternalCftLanguage.g:1570:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? ) ;
+    // InternalCftLanguage.g:1571:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4160,16 +4166,16 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1576:2: ( (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? ) )
-            // InternalCftLanguage.g:1577:2: (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? )
+            // InternalCftLanguage.g:1577:2: ( (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? ) )
+            // InternalCftLanguage.g:1578:2: (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? )
             {
-            // InternalCftLanguage.g:1577:2: (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? )
-            // InternalCftLanguage.g:1578:3: this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )?
+            // InternalCftLanguage.g:1578:2: (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? )
+            // InternalCftLanguage.g:1579:3: this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )?
             {
 
                                 newCompositeNode(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0());
                         
-            pushFollow(FOLLOW_34);
+            pushFollow(FOLLOW_33);
             this_QualifiedName_0=ruleQualifiedName();
 
             state._fsp--;
@@ -4180,7 +4186,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                                 afterParserOrEnumRuleCall();
                         
-            // InternalCftLanguage.g:1588:3: (kw= '.' kw= '*' )?
+            // InternalCftLanguage.g:1589:3: (kw= '.' kw= '*' )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -4189,9 +4195,9 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
             }
             switch (alt28) {
                 case 1 :
-                    // InternalCftLanguage.g:1589:4: kw= '.' kw= '*'
+                    // InternalCftLanguage.g:1590:4: kw= '.' kw= '*'
                     {
-                    kw=(Token)match(input,38,FOLLOW_35); 
+                    kw=(Token)match(input,38,FOLLOW_34); 
 
                                                 current.merge(kw);
                                                 newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1_0());
@@ -4230,7 +4236,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleValidId"
-    // InternalCftLanguage.g:1604:1: entryRuleValidId returns [String current=null] : iv_ruleValidId= ruleValidId EOF ;
+    // InternalCftLanguage.g:1605:1: entryRuleValidId returns [String current=null] : iv_ruleValidId= ruleValidId EOF ;
     public final String entryRuleValidId() throws RecognitionException {
         String current = null;
 
@@ -4238,8 +4244,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:1604:47: (iv_ruleValidId= ruleValidId EOF )
-            // InternalCftLanguage.g:1605:2: iv_ruleValidId= ruleValidId EOF
+            // InternalCftLanguage.g:1605:47: (iv_ruleValidId= ruleValidId EOF )
+            // InternalCftLanguage.g:1606:2: iv_ruleValidId= ruleValidId EOF
             {
              newCompositeNode(grammarAccess.getValidIdRule()); 
             pushFollow(FOLLOW_1);
@@ -4266,7 +4272,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleValidId"
-    // InternalCftLanguage.g:1611:1: ruleValidId returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT ) ;
+    // InternalCftLanguage.g:1612:1: ruleValidId returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT ) ;
     public final AntlrDatatypeRuleToken ruleValidId() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4277,10 +4283,10 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1617:2: ( (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT ) )
-            // InternalCftLanguage.g:1618:2: (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT )
+            // InternalCftLanguage.g:1618:2: ( (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT ) )
+            // InternalCftLanguage.g:1619:2: (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT )
             {
-            // InternalCftLanguage.g:1618:2: (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT )
+            // InternalCftLanguage.g:1619:2: (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT )
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -4298,7 +4304,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
             }
             switch (alt29) {
                 case 1 :
-                    // InternalCftLanguage.g:1619:3: this_ID_0= RULE_ID
+                    // InternalCftLanguage.g:1620:3: this_ID_0= RULE_ID
                     {
                     this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
@@ -4311,7 +4317,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:1627:3: this_OF_INT_1= RULE_OF_INT
+                    // InternalCftLanguage.g:1628:3: this_OF_INT_1= RULE_OF_INT
                     {
                     this_OF_INT_1=(Token)match(input,RULE_OF_INT,FOLLOW_2); 
 
@@ -4346,7 +4352,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDouble"
-    // InternalCftLanguage.g:1638:1: entryRuleDouble returns [String current=null] : iv_ruleDouble= ruleDouble EOF ;
+    // InternalCftLanguage.g:1639:1: entryRuleDouble returns [String current=null] : iv_ruleDouble= ruleDouble EOF ;
     public final String entryRuleDouble() throws RecognitionException {
         String current = null;
 
@@ -4354,8 +4360,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:1638:46: (iv_ruleDouble= ruleDouble EOF )
-            // InternalCftLanguage.g:1639:2: iv_ruleDouble= ruleDouble EOF
+            // InternalCftLanguage.g:1639:46: (iv_ruleDouble= ruleDouble EOF )
+            // InternalCftLanguage.g:1640:2: iv_ruleDouble= ruleDouble EOF
             {
              newCompositeNode(grammarAccess.getDoubleRule()); 
             pushFollow(FOLLOW_1);
@@ -4382,7 +4388,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDouble"
-    // InternalCftLanguage.g:1645:1: ruleDouble returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE ) ;
+    // InternalCftLanguage.g:1646:1: ruleDouble returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE ) ;
     public final AntlrDatatypeRuleToken ruleDouble() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4393,10 +4399,10 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1651:2: ( (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE ) )
-            // InternalCftLanguage.g:1652:2: (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE )
+            // InternalCftLanguage.g:1652:2: ( (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE ) )
+            // InternalCftLanguage.g:1653:2: (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE )
             {
-            // InternalCftLanguage.g:1652:2: (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE )
+            // InternalCftLanguage.g:1653:2: (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE )
             int alt30=2;
             int LA30_0 = input.LA(1);
 
@@ -4414,7 +4420,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
             }
             switch (alt30) {
                 case 1 :
-                    // InternalCftLanguage.g:1653:3: this_INT_0= RULE_INT
+                    // InternalCftLanguage.g:1654:3: this_INT_0= RULE_INT
                     {
                     this_INT_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
@@ -4427,7 +4433,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:1661:3: this_T_DOUBLE_1= RULE_T_DOUBLE
+                    // InternalCftLanguage.g:1662:3: this_T_DOUBLE_1= RULE_T_DOUBLE
                     {
                     this_T_DOUBLE_1=(Token)match(input,RULE_T_DOUBLE,FOLLOW_2); 
 
@@ -4497,8 +4503,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
     public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000003000000000L});
     public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000400000060L});
     public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000042L});
-    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000004000000002L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000010000000000L});
 
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSemanticSequencer.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSemanticSequencer.java
index 25f16824..fe329903 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSemanticSequencer.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSemanticSequencer.java
@@ -194,7 +194,7 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
          *     ComponentInstance returns ComponentInstance
          *
          * Constraint:
-         *     (componentType=[ComponentDefinition|QualifiedName] name=ID?)
+         *     (componentType=[ComponentDefinition|QualifiedName] name=ValidId?)
          */
         protected void sequence_ComponentInstance(ISerializationContext context, ComponentInstance semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/services/CftLanguageGrammarAccess.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/services/CftLanguageGrammarAccess.java
index cbcfbe95..2b9632b7 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/services/CftLanguageGrammarAccess.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/services/CftLanguageGrammarAccess.java
@@ -302,20 +302,20 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         public class ConstantDistributionElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ConstantDistribution");
                 private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cPKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Keyword cProbKeyword_0 = (Keyword)cGroup.eContents().get(0);
                 private final Keyword cEqualsSignKeyword_1 = (Keyword)cGroup.eContents().get(1);
                 private final Assignment cPAssignment_2 = (Assignment)cGroup.eContents().get(2);
                 private final RuleCall cPDoubleParserRuleCall_2_0 = (RuleCall)cPAssignment_2.eContents().get(0);
                 
                 //ConstantDistribution ft::ConstantDistribution:
-                //      "p" "=" p=Double;
+                //      "prob" "=" p=Double;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //"p" "=" p=Double
+                //"prob" "=" p=Double
                 public Group getGroup() { return cGroup; }
                 
-                //"p"
-                public Keyword getPKeyword_0() { return cPKeyword_0; }
+                //"prob"
+                public Keyword getProbKeyword_0() { return cProbKeyword_0; }
                 
                 //"="
                 public Keyword getEqualsSignKeyword_1() { return cEqualsSignKeyword_1; }
@@ -880,13 +880,13 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 private final CrossReference cComponentTypeComponentDefinitionCrossReference_1_0 = (CrossReference)cComponentTypeAssignment_1.eContents().get(0);
                 private final RuleCall cComponentTypeComponentDefinitionQualifiedNameParserRuleCall_1_0_1 = (RuleCall)cComponentTypeComponentDefinitionCrossReference_1_0.eContents().get(1);
                 private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
-                private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
+                private final RuleCall cNameValidIdParserRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
                 
                 //ComponentInstance:
-                //      "=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ID?;
+                //      "=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ValidId?;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //"=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ID?
+                //"=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ValidId?
                 public Group getGroup() { return cGroup; }
                 
                 //"=>"
@@ -901,11 +901,11 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 //QualifiedName
                 public RuleCall getComponentTypeComponentDefinitionQualifiedNameParserRuleCall_1_0_1() { return cComponentTypeComponentDefinitionQualifiedNameParserRuleCall_1_0_1; }
                 
-                //name=ID?
+                //name=ValidId?
                 public Assignment getNameAssignment_2() { return cNameAssignment_2; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_2_0() { return cNameValidIdParserRuleCall_2_0; }
         }
         public class QualifiedNameElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.QualifiedName");
@@ -1169,7 +1169,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         }
         
         //ConstantDistribution ft::ConstantDistribution:
-        //      "p" "=" p=Double;
+        //      "prob" "=" p=Double;
         public ConstantDistributionElements getConstantDistributionAccess() {
                 return pConstantDistribution;
         }
@@ -1306,7 +1306,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         }
         
         //ComponentInstance:
-        //      "=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ID?;
+        //      "=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ValidId?;
         public ComponentInstanceElements getComponentInstanceAccess() {
                 return pComponentInstance;
         }