91 files changed, 583 insertions, 246 deletions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/AbstractVampireLanguageRuntimeModule.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/AbstractVampireLanguageRuntimeModule.java
index 5d94a5bb..b5884df4 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/AbstractVampireLanguageRuntimeModule.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/AbstractVampireLanguageRuntimeModule.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner;
@@ -12,6 +12,7 @@ import ca.mcgill.ecse.dslreasoner.scoping.VampireLanguageScopeProvider;
 import ca.mcgill.ecse.dslreasoner.serializer.VampireLanguageSemanticSequencer;
 import ca.mcgill.ecse.dslreasoner.serializer.VampireLanguageSyntacticSequencer;
 import ca.mcgill.ecse.dslreasoner.services.VampireLanguageGrammarAccess;
+import ca.mcgill.ecse.dslreasoner.validation.VampireLanguageConfigurableIssueCodesProvider;
 import ca.mcgill.ecse.dslreasoner.validation.VampireLanguageValidator;
 import com.google.inject.Binder;
 import com.google.inject.Provider;
@@ -54,6 +55,7 @@ import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
 import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer;
 import org.eclipse.xtext.service.DefaultRuntimeModule;
 import org.eclipse.xtext.service.SingletonBinding;
+import org.eclipse.xtext.validation.ConfigurableIssueCodesProvider;
 /**
 * Manual modifications go to {@link VampireLanguageRuntimeModule}.
@@ -146,6 +148,11 @@ public abstract class AbstractVampireLanguageRuntimeModule extends DefaultRuntim
                return VampireLanguageValidator.class;
        }
        
+        // contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2
+        public Class<? extends ConfigurableIssueCodesProvider> bindConfigurableIssueCodesProvider() {
+                return VampireLanguageConfigurableIssueCodesProvider.class;
+        }
+        
        // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
        public Class<? extends IScopeProvider> bindIScopeProvider() {
                return VampireLanguageScopeProvider.class;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin
index 337977f1..7b781383 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetupGenerated.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetupGenerated.java
index df52ec67..d2b4312b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetupGenerated.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetupGenerated.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageAntlrTokenFileProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageAntlrTokenFileProvider.java
index a4da8047..43a00009 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageAntlrTokenFileProvider.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageAntlrTokenFileProvider.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.parser.antlr;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageParser.java
index 0e487d5c..11a9d1ed 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageParser.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageParser.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.parser.antlr;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g
index 2ab53393..62840209 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 grammar InternalVampireLanguage;
@@ -2187,11 +2187,11 @@ ruleVLSFofTerm returns [EObject current=null]
                }
                    |
                {
-                        newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1());
+                        newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1());
                }
-                this_VLSFunctionFof_1=ruleVLSFunctionFof
+                this_VLSFunctionAsTerm_1=ruleVLSFunctionAsTerm
                {
-                        $current = $this_VLSFunctionFof_1.current;
+                        $current = $this_VLSFunctionAsTerm_1.current;
                        afterParserOrEnumRuleCall();
                }
                    |
@@ -2206,15 +2206,15 @@ ruleVLSFofTerm returns [EObject current=null]
        )
 ;
-// Entry rule entryRuleVLSFunctionFof
+// Entry rule entryRuleVLSFunctionAsTerm
-entryRuleVLSFunctionFof returns [EObject current=null]:
+entryRuleVLSFunctionAsTerm returns [EObject current=null]:
-        { newCompositeNode(grammarAccess.getVLSFunctionFofRule()); }
+        { newCompositeNode(grammarAccess.getVLSFunctionAsTermRule()); }
-        iv_ruleVLSFunctionFof=ruleVLSFunctionFof
+        iv_ruleVLSFunctionAsTerm=ruleVLSFunctionAsTerm
-        { $current=$iv_ruleVLSFunctionFof.current; }
+        { $current=$iv_ruleVLSFunctionAsTerm.current; }
        EOF;
-// Rule VLSFunctionFof
+// Rule VLSFunctionAsTerm
-ruleVLSFunctionFof returns [EObject current=null]
+ruleVLSFunctionAsTerm returns [EObject current=null]
 @init {
        enterRule();
 }
@@ -2227,11 +2227,11 @@ ruleVLSFunctionFof returns [EObject current=null]
                                (
                                        lv_functor_0_1=RULE_LOWER_WORD_ID
                                        {
-                                                newLeafNode(lv_functor_0_1, grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0());
+                                                newLeafNode(lv_functor_0_1, grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0());
                                        }
                                        {
                                                if ($current==null) {
-                                                        $current = createModelElement(grammarAccess.getVLSFunctionFofRule());
+                                                        $current = createModelElement(grammarAccess.getVLSFunctionAsTermRule());
                                                }
                                                setWithLastConsumed(
                                                        $current,
@@ -2242,11 +2242,11 @@ ruleVLSFunctionFof returns [EObject current=null]
                                            |
                                        lv_functor_0_2=RULE_SINGLE_QUOTE
                                        {
-                                                newLeafNode(lv_functor_0_2, grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1());
+                                                newLeafNode(lv_functor_0_2, grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1());
                                        }
                                        {
                                                if ($current==null) {
-                                                        $current = createModelElement(grammarAccess.getVLSFunctionFofRule());
+                                                        $current = createModelElement(grammarAccess.getVLSFunctionAsTermRule());
                                                }
                                                setWithLastConsumed(
                                                        $current,
@@ -2257,11 +2257,11 @@ ruleVLSFunctionFof returns [EObject current=null]
                                            |
                                        lv_functor_0_3=RULE_DOLLAR_ID
                                        {
-                                                newLeafNode(lv_functor_0_3, grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2());
+                                                newLeafNode(lv_functor_0_3, grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2());
                                        }
                                        {
                                                if ($current==null) {
-                                                        $current = createModelElement(grammarAccess.getVLSFunctionFofRule());
+                                                        $current = createModelElement(grammarAccess.getVLSFunctionAsTermRule());
                                                }
                                                setWithLastConsumed(
                                                        $current,
@@ -2272,11 +2272,11 @@ ruleVLSFunctionFof returns [EObject current=null]
                                            |
                                        lv_functor_0_4=RULE_DOUBLE_DOLLAR_ID
                                        {
-                                                newLeafNode(lv_functor_0_4, grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3());
+                                                newLeafNode(lv_functor_0_4, grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3());
                                        }
                                        {
                                                if ($current==null) {
-                                                        $current = createModelElement(grammarAccess.getVLSFunctionFofRule());
+                                                        $current = createModelElement(grammarAccess.getVLSFunctionAsTermRule());
                                                }
                                                setWithLastConsumed(
                                                        $current,
@@ -2290,17 +2290,17 @@ ruleVLSFunctionFof returns [EObject current=null]
                (
                        otherlv_1='('
                        {
-                                newLeafNode(otherlv_1, grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0());
+                                newLeafNode(otherlv_1, grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0());
                        }
                        (
                                (
                                        {
-                                                newCompositeNode(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0());
+                                                newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0());
                                        }
                                        lv_terms_2_0=ruleVLSFofTerm
                                        {
                                                if ($current==null) {
-                                                        $current = createModelElementForParent(grammarAccess.getVLSFunctionFofRule());
+                                                        $current = createModelElementForParent(grammarAccess.getVLSFunctionAsTermRule());
                                                }
                                                add(
                                                        $current,
@@ -2314,17 +2314,17 @@ ruleVLSFunctionFof returns [EObject current=null]
                        (
                                otherlv_3=','
                                {
-                                        newLeafNode(otherlv_3, grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0());
+                                        newLeafNode(otherlv_3, grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0());
                                }
                                (
                                        (
                                                {
-                                                        newCompositeNode(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0());
+                                                        newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0());
                                                }
                                                lv_terms_4_0=ruleVLSFofTerm
                                                {
                                                        if ($current==null) {
-                                                                $current = createModelElementForParent(grammarAccess.getVLSFunctionFofRule());
+                                                                $current = createModelElementForParent(grammarAccess.getVLSFunctionAsTermRule());
                                                        }
                                                        add(
                                                                $current,
@@ -2338,7 +2338,7 @@ ruleVLSFunctionFof returns [EObject current=null]
                        )*
                        otherlv_5=')'
                        {
-                                newLeafNode(otherlv_5, grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3());
+                                newLeafNode(otherlv_5, grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3());
                        }
                )?
        )
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java
index 3d1e277b..f44428a0 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java
@@ -5509,13 +5509,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "ruleVLSFofTerm"
-    // InternalVampireLanguage.g:2172:1: ruleVLSFofTerm returns [EObject current=null] : (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionFof_1= ruleVLSFunctionFof | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) ;
+    // InternalVampireLanguage.g:2172:1: ruleVLSFofTerm returns [EObject current=null] : (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) ;
    public final EObject ruleVLSFofTerm() throws RecognitionException {
        EObject current = null;
        EObject this_VLSVariable_0 = null;
-        EObject this_VLSFunctionFof_1 = null;
+        EObject this_VLSFunctionAsTerm_1 = null;
        EObject this_VLSDefinedTerm_2 = null;
@@ -5524,10 +5524,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                enterRule();
        try {
-            // InternalVampireLanguage.g:2178:2: ( (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionFof_1= ruleVLSFunctionFof | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) )
+            // InternalVampireLanguage.g:2178:2: ( (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) )
-            // InternalVampireLanguage.g:2179:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionFof_1= ruleVLSFunctionFof | this_VLSDefinedTerm_2= ruleVLSDefinedTerm )
+            // InternalVampireLanguage.g:2179:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm )
            {
-            // InternalVampireLanguage.g:2179:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionFof_1= ruleVLSFunctionFof | this_VLSDefinedTerm_2= ruleVLSDefinedTerm )
+            // InternalVampireLanguage.g:2179:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm )
            int alt31=3;
            switch ( input.LA(1) ) {
            case RULE_UPPER_WORD_ID:
@@ -5578,18 +5578,18 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 2 :
-                    // InternalVampireLanguage.g:2189:3: this_VLSFunctionFof_1= ruleVLSFunctionFof
+                    // InternalVampireLanguage.g:2189:3: this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm
                    {
-                                        newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1());
+                                        newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1());
                                
                    pushFollow(FOLLOW_2);
-                    this_VLSFunctionFof_1=ruleVLSFunctionFof();
+                    this_VLSFunctionAsTerm_1=ruleVLSFunctionAsTerm();
                    state._fsp--;
-                                        current = this_VLSFunctionFof_1;
+                                        current = this_VLSFunctionAsTerm_1;
                                        afterParserOrEnumRuleCall();
                                
@@ -5635,25 +5635,25 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR end "ruleVLSFofTerm"
-    // $ANTLR start "entryRuleVLSFunctionFof"
+    // $ANTLR start "entryRuleVLSFunctionAsTerm"
-    // InternalVampireLanguage.g:2210:1: entryRuleVLSFunctionFof returns [EObject current=null] : iv_ruleVLSFunctionFof= ruleVLSFunctionFof EOF ;
+    // InternalVampireLanguage.g:2210:1: entryRuleVLSFunctionAsTerm returns [EObject current=null] : iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF ;
-    public final EObject entryRuleVLSFunctionFof() throws RecognitionException {
+    public final EObject entryRuleVLSFunctionAsTerm() throws RecognitionException {
        EObject current = null;
-        EObject iv_ruleVLSFunctionFof = null;
+        EObject iv_ruleVLSFunctionAsTerm = null;
        try {
-            // InternalVampireLanguage.g:2210:55: (iv_ruleVLSFunctionFof= ruleVLSFunctionFof EOF )
+            // InternalVampireLanguage.g:2210:58: (iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF )
-            // InternalVampireLanguage.g:2211:2: iv_ruleVLSFunctionFof= ruleVLSFunctionFof EOF
+            // InternalVampireLanguage.g:2211:2: iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF
            {
-             newCompositeNode(grammarAccess.getVLSFunctionFofRule()); 
+             newCompositeNode(grammarAccess.getVLSFunctionAsTermRule()); 
            pushFollow(FOLLOW_1);
-            iv_ruleVLSFunctionFof=ruleVLSFunctionFof();
+            iv_ruleVLSFunctionAsTerm=ruleVLSFunctionAsTerm();
            state._fsp--;
-             current =iv_ruleVLSFunctionFof; 
+             current =iv_ruleVLSFunctionAsTerm; 
            match(input,EOF,FOLLOW_2); 
            }
@@ -5668,12 +5668,12 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
        }
        return current;
    }
-    // $ANTLR end "entryRuleVLSFunctionFof"
+    // $ANTLR end "entryRuleVLSFunctionAsTerm"
-    // $ANTLR start "ruleVLSFunctionFof"
+    // $ANTLR start "ruleVLSFunctionAsTerm"
-    // InternalVampireLanguage.g:2217:1: ruleVLSFunctionFof returns [EObject current=null] : ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? ) ;
+    // InternalVampireLanguage.g:2217:1: ruleVLSFunctionAsTerm returns [EObject current=null] : ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? ) ;
-    public final EObject ruleVLSFunctionFof() throws RecognitionException {
+    public final EObject ruleVLSFunctionAsTerm() throws RecognitionException {
        EObject current = null;
        Token lv_functor_0_1=null;
@@ -5740,11 +5740,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                    {
                    lv_functor_0_1=(Token)match(input,RULE_LOWER_WORD_ID,FOLLOW_31); 
-                                                                newLeafNode(lv_functor_0_1, grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0());
+                                                                newLeafNode(lv_functor_0_1, grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0());
                                                        
                                                                if (current==null) {
-                                                                        current = createModelElement(grammarAccess.getVLSFunctionFofRule());
+                                                                        current = createModelElement(grammarAccess.getVLSFunctionAsTermRule());
                                                                }
                                                                setWithLastConsumed(
                                                                        current,
@@ -5760,11 +5760,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                    {
                    lv_functor_0_2=(Token)match(input,RULE_SINGLE_QUOTE,FOLLOW_31); 
-                                                                newLeafNode(lv_functor_0_2, grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1());
+                                                                newLeafNode(lv_functor_0_2, grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1());
                                                        
                                                                if (current==null) {
-                                                                        current = createModelElement(grammarAccess.getVLSFunctionFofRule());
+                                                                        current = createModelElement(grammarAccess.getVLSFunctionAsTermRule());
                                                                }
                                                                setWithLastConsumed(
                                                                        current,
@@ -5780,11 +5780,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                    {
                    lv_functor_0_3=(Token)match(input,RULE_DOLLAR_ID,FOLLOW_31); 
-                                                                newLeafNode(lv_functor_0_3, grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2());
+                                                                newLeafNode(lv_functor_0_3, grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2());
                                                        
                                                                if (current==null) {
-                                                                        current = createModelElement(grammarAccess.getVLSFunctionFofRule());
+                                                                        current = createModelElement(grammarAccess.getVLSFunctionAsTermRule());
                                                                }
                                                                setWithLastConsumed(
                                                                        current,
@@ -5800,11 +5800,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                    {
                    lv_functor_0_4=(Token)match(input,RULE_DOUBLE_DOLLAR_ID,FOLLOW_31); 
-                                                                newLeafNode(lv_functor_0_4, grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3());
+                                                                newLeafNode(lv_functor_0_4, grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3());
                                                        
                                                                if (current==null) {
-                                                                        current = createModelElement(grammarAccess.getVLSFunctionFofRule());
+                                                                        current = createModelElement(grammarAccess.getVLSFunctionAsTermRule());
                                                                }
                                                                setWithLastConsumed(
                                                                        current,
@@ -5837,7 +5837,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                    {
                    otherlv_1=(Token)match(input,34,FOLLOW_30); 
-                                                newLeafNode(otherlv_1, grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0());
+                                                newLeafNode(otherlv_1, grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0());
                                        
                    // InternalVampireLanguage.g:2295:4: ( (lv_terms_2_0= ruleVLSFofTerm ) )
                    // InternalVampireLanguage.g:2296:5: (lv_terms_2_0= ruleVLSFofTerm )
@@ -5846,7 +5846,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                    // InternalVampireLanguage.g:2297:6: lv_terms_2_0= ruleVLSFofTerm
                    {
-                                                                newCompositeNode(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0());
+                                                                newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0());
                                                        
                    pushFollow(FOLLOW_14);
                    lv_terms_2_0=ruleVLSFofTerm();
@@ -5855,7 +5855,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                                                                if (current==null) {
-                                                                        current = createModelElementForParent(grammarAccess.getVLSFunctionFofRule());
+                                                                        current = createModelElementForParent(grammarAccess.getVLSFunctionAsTermRule());
                                                                }
                                                                add(
                                                                        current,
@@ -5887,7 +5887,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                            {
                            otherlv_3=(Token)match(input,29,FOLLOW_30); 
-                                                                newLeafNode(otherlv_3, grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0());
+                                                                newLeafNode(otherlv_3, grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0());
                                                        
                            // InternalVampireLanguage.g:2319:5: ( (lv_terms_4_0= ruleVLSFofTerm ) )
                            // InternalVampireLanguage.g:2320:6: (lv_terms_4_0= ruleVLSFofTerm )
@@ -5896,7 +5896,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                            // InternalVampireLanguage.g:2321:7: lv_terms_4_0= ruleVLSFofTerm
                            {
-                                                                                newCompositeNode(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0());
+                                                                                newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0());
                                                                        
                            pushFollow(FOLLOW_14);
                            lv_terms_4_0=ruleVLSFofTerm();
@@ -5905,7 +5905,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                                                                                if (current==null) {
-                                                                                        current = createModelElementForParent(grammarAccess.getVLSFunctionFofRule());
+                                                                                        current = createModelElementForParent(grammarAccess.getVLSFunctionAsTermRule());
                                                                                }
                                                                                add(
                                                                                        current,
@@ -5931,7 +5931,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                    otherlv_5=(Token)match(input,35,FOLLOW_2); 
-                                                newLeafNode(otherlv_5, grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3());
+                                                newLeafNode(otherlv_5, grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3());
                                        
                    }
@@ -5958,7 +5958,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
        }
        return current;
    }
-    // $ANTLR end "ruleVLSFunctionFof"
+    // $ANTLR end "ruleVLSFunctionAsTerm"
    // $ANTLR start "entryRuleVLSDefinedTerm"
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/scoping/AbstractVampireLanguageScopeProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/scoping/AbstractVampireLanguageScopeProvider.java
index 0f5a902d..28f2f810 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/scoping/AbstractVampireLanguageScopeProvider.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/scoping/AbstractVampireLanguageScopeProvider.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.scoping;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java
index 890341db..bae51ef0 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.serializer;
@@ -16,7 +16,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFalse;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;
-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality;
@@ -107,8 +107,8 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
                        case VampireLanguagePackage.VLS_FUNCTION:
                                sequence_VLSAtomicFunction(context, (VLSFunction) semanticObject); 
                                return; 
-                        case VampireLanguagePackage.VLS_FUNCTION_FOF:
+                        case VampireLanguagePackage.VLS_FUNCTION_AS_TERM:
-                                sequence_VLSFunctionFof(context, (VLSFunctionFof) semanticObject); 
+                                sequence_VLSFunctionAsTerm(context, (VLSFunctionAsTerm) semanticObject); 
                                return; 
                        case VampireLanguagePackage.VLS_IMPLIES:
                                sequence_VLSBinary(context, (VLSImplies) semanticObject); 
@@ -786,13 +786,13 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
        
        /**
         * Contexts:
-         *     VLSFofTerm returns VLSFunctionFof
+         *     VLSFofTerm returns VLSFunctionAsTerm
-         *     VLSFunctionFof returns VLSFunctionFof
+         *     VLSFunctionAsTerm returns VLSFunctionAsTerm
         *
         * Constraint:
         *     ((functor=LOWER_WORD_ID | functor=SINGLE_QUOTE | functor=DOLLAR_ID | functor=DOUBLE_DOLLAR_ID) (terms+=VLSFofTerm terms+=VLSFofTerm*)?)
         */
-        protected void sequence_VLSFunctionFof(ISerializationContext context, VLSFunctionFof semanticObject) {
+        protected void sequence_VLSFunctionAsTerm(ISerializationContext context, VLSFunctionAsTerm semanticObject) {
                genericSequencer.createSequence(context, semanticObject);
        }
        
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java
index 5c1a720e..922fca87 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.serializer;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java
index c5bd8be2..e159834e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.services;
@@ -1382,28 +1382,28 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSFofTerm");
                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
                private final RuleCall cVLSVariableParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final RuleCall cVLSFunctionFofParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cVLSFunctionAsTermParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
                private final RuleCall cVLSDefinedTermParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
                
                //VLSFofTerm VLSTerm:
-                //      VLSVariable | VLSFunctionFof | VLSDefinedTerm;
+                //      VLSVariable | VLSFunctionAsTerm | VLSDefinedTerm;
                @Override public ParserRule getRule() { return rule; }
                
                ////(VLSVariable | VLSFunction | VLSTffConditional | VLSTffLet | VLSTffTuple)
-                //VLSVariable | VLSFunctionFof | VLSDefinedTerm
+                //VLSVariable | VLSFunctionAsTerm | VLSDefinedTerm
                public Alternatives getAlternatives() { return cAlternatives; }
                
                //VLSVariable
                public RuleCall getVLSVariableParserRuleCall_0() { return cVLSVariableParserRuleCall_0; }
                
-                //VLSFunctionFof
+                //VLSFunctionAsTerm
-                public RuleCall getVLSFunctionFofParserRuleCall_1() { return cVLSFunctionFofParserRuleCall_1; }
+                public RuleCall getVLSFunctionAsTermParserRuleCall_1() { return cVLSFunctionAsTermParserRuleCall_1; }
                
                //VLSDefinedTerm
                public RuleCall getVLSDefinedTermParserRuleCall_2() { return cVLSDefinedTermParserRuleCall_2; }
        }
-        public class VLSFunctionFofElements extends AbstractParserRuleElementFinder {
+        public class VLSFunctionAsTermElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSFunctionFof");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSFunctionAsTerm");
                private final Group cGroup = (Group)rule.eContents().get(1);
                private final Assignment cFunctorAssignment_0 = (Assignment)cGroup.eContents().get(0);
                private final Alternatives cFunctorAlternatives_0_0 = (Alternatives)cFunctorAssignment_0.eContents().get(0);
@@ -1421,7 +1421,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cTermsVLSFofTermParserRuleCall_1_2_1_0 = (RuleCall)cTermsAssignment_1_2_1.eContents().get(0);
                private final Keyword cRightParenthesisKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3);
                
-                //VLSFunctionFof:
+                //VLSFunctionAsTerm:
                //      functor=(LOWER_WORD_ID | SINGLE_QUOTE | DOLLAR_ID | DOUBLE_DOLLAR_ID) ('(' terms+=VLSFofTerm (',' terms+=VLSFofTerm)*
                //      ')')?;
                @Override public ParserRule getRule() { return rule; }
@@ -1599,7 +1599,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
        private final VLSAtomicFunctionElements pVLSAtomicFunction;
        private final VLSVariableElements pVLSVariable;
        private final VLSFofTermElements pVLSFofTerm;
-        private final VLSFunctionFofElements pVLSFunctionFof;
+        private final VLSFunctionAsTermElements pVLSFunctionAsTerm;
        private final VLSDefinedTermElements pVLSDefinedTerm;
        
        private final Grammar grammar;
@@ -1652,7 +1652,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
                this.pVLSAtomicFunction = new VLSAtomicFunctionElements();
                this.pVLSVariable = new VLSVariableElements();
                this.pVLSFofTerm = new VLSFofTermElements();
-                this.pVLSFunctionFof = new VLSFunctionFofElements();
+                this.pVLSFunctionAsTerm = new VLSFunctionAsTermElements();
                this.pVLSDefinedTerm = new VLSDefinedTermElements();
        }
        
@@ -2145,7 +2145,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        
        //VLSFofTerm VLSTerm:
-        //      VLSVariable | VLSFunctionFof | VLSDefinedTerm;
+        //      VLSVariable | VLSFunctionAsTerm | VLSDefinedTerm;
        public VLSFofTermElements getVLSFofTermAccess() {
                return pVLSFofTerm;
        }
@@ -2154,15 +2154,15 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
                return getVLSFofTermAccess().getRule();
        }
        
-        //VLSFunctionFof:
+        //VLSFunctionAsTerm:
        //      functor=(LOWER_WORD_ID | SINGLE_QUOTE | DOLLAR_ID | DOUBLE_DOLLAR_ID) ('(' terms+=VLSFofTerm (',' terms+=VLSFofTerm)*
        //      ')')?;
-        public VLSFunctionFofElements getVLSFunctionFofAccess() {
+        public VLSFunctionAsTermElements getVLSFunctionAsTermAccess() {
-                return pVLSFunctionFof;
+                return pVLSFunctionAsTerm;
        }
        
-        public ParserRule getVLSFunctionFofRule() {
+        public ParserRule getVLSFunctionAsTermRule() {
-                return getVLSFunctionFofAccess().getRule();
+                return getVLSFunctionAsTermAccess().getRule();
        }
        
        //VLSDefinedTerm:
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/AbstractVampireLanguageValidator.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/AbstractVampireLanguageValidator.java
index 65104ffb..8c94ec86 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/AbstractVampireLanguageValidator.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/AbstractVampireLanguageValidator.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.validation;
@@ -16,5 +16,4 @@ public abstract class AbstractVampireLanguageValidator extends AbstractDeclarati
                result.add(ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage.eINSTANCE);
                return result;
        }
-        
 }
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageConfigurableIssueCodesProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageConfigurableIssueCodesProvider.java
new file mode 100644
index 00000000..1d504c4e
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageConfigurableIssueCodesProvider.java
@@ -0,0 +1,22 @@
+/*
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.validation;
+import org.eclipse.xtext.preferences.PreferenceKey;
+import org.eclipse.xtext.util.IAcceptor;
+import org.eclipse.xtext.validation.ConfigurableIssueCodesProvider;
+import org.eclipse.xtext.validation.SeverityConverter;
+@SuppressWarnings("restriction")
+public class VampireLanguageConfigurableIssueCodesProvider extends ConfigurableIssueCodesProvider {
+        protected static final String ISSUE_CODE_PREFIX = "ca.mcgill.ecse.dslreasoner.";
+        public static final String DEPRECATED_MODEL_PART = ISSUE_CODE_PREFIX + "deprecatedModelPart";
+        @Override
+        protected void initialize(IAcceptor<PreferenceKey> acceptor) {
+                super.initialize(acceptor);
+                acceptor.accept(create(DEPRECATED_MODEL_PART, SeverityConverter.SEVERITY_WARNING));
+        }
+}
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnd.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnd.java
index de1ac885..f4b137c3 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnd.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnd.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnnotation.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnnotation.java
index 94f9f966..10cba836 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnnotation.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnnotation.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAssignment.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAssignment.java
index c73be6d1..24b65b51 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAssignment.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAssignment.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSComment.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSComment.java
index f317edbd..203859a9 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSComment.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSComment.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConfirmations.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConfirmations.java
index 25e607f9..96ce4861 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConfirmations.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConfirmations.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConstant.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConstant.java
index 3e9d1ff2..b252cced 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConstant.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConstant.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDefinedTerm.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDefinedTerm.java
index 12708167..4dc408e5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDefinedTerm.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDefinedTerm.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDoubleQuote.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDoubleQuote.java
index 501faf36..e5702848 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDoubleQuote.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDoubleQuote.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquality.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquality.java
index aadf2ade..db02f2c2 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquality.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquality.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquivalent.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquivalent.java
index 639a9f72..25e6fbe1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquivalent.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquivalent.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java
index 929385ac..d3a19016 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFalse.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFalse.java
index e1bfd960..33a5fba8 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFalse.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFalse.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFofFormula.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFofFormula.java
index 8de99107..41479be9 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFofFormula.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFofFormula.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunction.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunction.java
index 7b4d0a30..e5bef1b5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunction.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunction.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunctionAsTerm.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunctionAsTerm.java
new file mode 100644
index 00000000..a3872bc6
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunctionAsTerm.java
@@ -0,0 +1,69 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage;
+import org.eclipse.emf.common.util.EList;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>VLS Function As Term</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getFunctor <em>Functor</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getTerms <em>Terms</em>}</li>
+ * </ul>
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFunctionAsTerm()
+ * @model
+ * @generated
+ */
+public interface VLSFunctionAsTerm extends VLSTerm
+{
+  /**
+   * Returns the value of the '<em><b>Functor</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Functor</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Functor</em>' attribute.
+   * @see #setFunctor(String)
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFunctionAsTerm_Functor()
+   * @model
+   * @generated
+   */
+  String getFunctor();
+  /**
+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getFunctor <em>Functor</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Functor</em>' attribute.
+   * @see #getFunctor()
+   * @generated
+   */
+  void setFunctor(String value);
+  /**
+   * Returns the value of the '<em><b>Terms</b></em>' containment reference list.
+   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Terms</em>' containment reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Terms</em>' containment reference list.
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFunctionAsTerm_Terms()
+   * @model containment="true"
+   * @generated
+   */
+  EList<VLSTerm> getTerms();
+} // VLSFunctionAsTerm
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSImplies.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSImplies.java
index 26e1f5f5..860ab242 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSImplies.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSImplies.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java
index 29e93ff2..e90fbe47 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInequality.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInequality.java
index a5d4c815..e739e4e0 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInequality.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInequality.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInt.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInt.java
index 41e0de04..7639fe55 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInt.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInt.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSLess.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSLess.java
index accb525d..ae96339e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSLess.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSLess.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java
index 79019bb5..32981a8b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNand.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNand.java
index 1735fd12..1b86f1bd 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNand.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNand.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNor.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNor.java
index af57a7f4..d2f97d5c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNor.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNor.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOr.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOr.java
index 4c1fb0ee..6bb521d6 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOr.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOr.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java
index 8ad40ca5..017f231c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java
index f5686c88..3933fe6e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRevImplies.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRevImplies.java
index 7a8c96b7..348acc5b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRevImplies.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRevImplies.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSSatisfiable.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSSatisfiable.java
index 75006570..da645e63 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSSatisfiable.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSSatisfiable.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java
index 4a3e51bb..57ce9098 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java
index 8b455f0a..a574b641 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrue.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrue.java
index 865fae07..78aed874 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrue.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrue.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUnaryNegation.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUnaryNegation.java
index cc81aad4..cec6ca6d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUnaryNegation.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUnaryNegation.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java
index 8b7c913b..28ae1a33 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java
index 90b3b95d..9750e4c5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSXnor.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSXnor.java
index ba433cec..64b1f584 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSXnor.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSXnor.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java
index 84b65a59..0fb23c87 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
@@ -123,13 +123,13 @@ public interface VampireLanguageFactory extends EFactory
  VLSVariable createVLSVariable();
  /**
-   * Returns a new object of class '<em>VLS Function Fof</em>'.
+   * Returns a new object of class '<em>VLS Function As Term</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>VLS Function Fof</em>'.
+   * @return a new object of class '<em>VLS Function As Term</em>'.
   * @generated
   */
-  VLSFunctionFof createVLSFunctionFof();
+  VLSFunctionAsTerm createVLSFunctionAsTerm();
  /**
   * Returns a new object of class '<em>VLS Defined Term</em>'.
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java
index e7df5378..60061aee 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
@@ -456,14 +456,14 @@ public interface VampireLanguagePackage extends EPackage
  int VLS_VARIABLE_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl <em>VLS Function Fof</em>}' class.
+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl <em>VLS Function As Term</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl
-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionFof()
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionAsTerm()
   * @generated
   */
-  int VLS_FUNCTION_FOF = 11;
+  int VLS_FUNCTION_AS_TERM = 11;
  /**
   * The feature id for the '<em><b>Functor</b></em>' attribute.
@@ -472,7 +472,7 @@ public interface VampireLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int VLS_FUNCTION_FOF__FUNCTOR = VLS_TERM_FEATURE_COUNT + 0;
+  int VLS_FUNCTION_AS_TERM__FUNCTOR = VLS_TERM_FEATURE_COUNT + 0;
  /**
   * The feature id for the '<em><b>Terms</b></em>' containment reference list.
@@ -481,16 +481,16 @@ public interface VampireLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int VLS_FUNCTION_FOF__TERMS = VLS_TERM_FEATURE_COUNT + 1;
+  int VLS_FUNCTION_AS_TERM__TERMS = VLS_TERM_FEATURE_COUNT + 1;
  /**
-   * The number of structural features of the '<em>VLS Function Fof</em>' class.
+   * The number of structural features of the '<em>VLS Function As Term</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int VLS_FUNCTION_FOF_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 2;
+  int VLS_FUNCTION_AS_TERM_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 2;
  /**
   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDefinedTermImpl <em>VLS Defined Term</em>}' class.
@@ -1624,36 +1624,36 @@ public interface VampireLanguagePackage extends EPackage
  EAttribute getVLSVariable_Name();
  /**
-   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof <em>VLS Function Fof</em>}'.
+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm <em>VLS Function As Term</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>VLS Function Fof</em>'.
+   * @return the meta object for class '<em>VLS Function As Term</em>'.
-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm
   * @generated
   */
-  EClass getVLSFunctionFof();
+  EClass getVLSFunctionAsTerm();
  /**
-   * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getFunctor <em>Functor</em>}'.
+   * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getFunctor <em>Functor</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @return the meta object for the attribute '<em>Functor</em>'.
-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getFunctor()
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getFunctor()
-   * @see #getVLSFunctionFof()
+   * @see #getVLSFunctionAsTerm()
   * @generated
   */
-  EAttribute getVLSFunctionFof_Functor();
+  EAttribute getVLSFunctionAsTerm_Functor();
  /**
-   * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getTerms <em>Terms</em>}'.
+   * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getTerms <em>Terms</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @return the meta object for the containment reference list '<em>Terms</em>'.
-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getTerms()
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getTerms()
-   * @see #getVLSFunctionFof()
+   * @see #getVLSFunctionAsTerm()
   * @generated
   */
-  EReference getVLSFunctionFof_Terms();
+  EReference getVLSFunctionAsTerm_Terms();
  /**
   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDefinedTerm <em>VLS Defined Term</em>}'.
@@ -2560,14 +2560,14 @@ public interface VampireLanguagePackage extends EPackage
    EAttribute VLS_VARIABLE__NAME = eINSTANCE.getVLSVariable_Name();
    /**
-     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl <em>VLS Function Fof</em>}' class.
+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl <em>VLS Function As Term</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl
+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl
-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionFof()
+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionAsTerm()
     * @generated
     */
-    EClass VLS_FUNCTION_FOF = eINSTANCE.getVLSFunctionFof();
+    EClass VLS_FUNCTION_AS_TERM = eINSTANCE.getVLSFunctionAsTerm();
    /**
     * The meta object literal for the '<em><b>Functor</b></em>' attribute feature.
@@ -2575,7 +2575,7 @@ public interface VampireLanguagePackage extends EPackage
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute VLS_FUNCTION_FOF__FUNCTOR = eINSTANCE.getVLSFunctionFof_Functor();
+    EAttribute VLS_FUNCTION_AS_TERM__FUNCTOR = eINSTANCE.getVLSFunctionAsTerm_Functor();
    /**
     * The meta object literal for the '<em><b>Terms</b></em>' containment reference list feature.
@@ -2583,7 +2583,7 @@ public interface VampireLanguagePackage extends EPackage
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference VLS_FUNCTION_FOF__TERMS = eINSTANCE.getVLSFunctionFof_Terms();
+    EReference VLS_FUNCTION_AS_TERM__TERMS = eINSTANCE.getVLSFunctionAsTerm_Terms();
    /**
     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDefinedTermImpl <em>VLS Defined Term</em>}' class.
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java
index be258228..be0e2f59 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAndImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAndImpl.java
index 951de940..bd0df208 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAndImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAndImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAnnotationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAnnotationImpl.java
index 092dd4c9..b55f087b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAnnotationImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAnnotationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -301,7 +301,7 @@ public class VLSAnnotationImpl extends MinimalEObjectImpl.Container implements V
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (name: ");
    result.append(name);
    result.append(')');
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAssignmentImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAssignmentImpl.java
index e6dbb58d..76ea3ec9 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAssignmentImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAssignmentImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSCommentImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSCommentImpl.java
index 9599872d..6e9ab1ef 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSCommentImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSCommentImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -168,7 +168,7 @@ public class VLSCommentImpl extends MinimalEObjectImpl.Container implements VLSC
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (comment: ");
    result.append(comment);
    result.append(')');
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConfirmationsImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConfirmationsImpl.java
index fb4bbf82..bfa10db2 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConfirmationsImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConfirmationsImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConstantImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConstantImpl.java
index b9bcf512..d552dc2b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConstantImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConstantImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -167,7 +167,7 @@ public class VLSConstantImpl extends VLSTermImpl implements VLSConstant
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (name: ");
    result.append(name);
    result.append(')');
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDefinedTermImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDefinedTermImpl.java
index 444e2b85..eced6b57 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDefinedTermImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDefinedTermImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -167,7 +167,7 @@ public class VLSDefinedTermImpl extends VLSTermImpl implements VLSDefinedTerm
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (value: ");
    result.append(value);
    result.append(')');
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDoubleQuoteImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDoubleQuoteImpl.java
index db99a631..4eeb1757 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDoubleQuoteImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDoubleQuoteImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEqualityImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEqualityImpl.java
index ba729215..8ad728ad 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEqualityImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEqualityImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEquivalentImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEquivalentImpl.java
index 2ab11117..e90d4359 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEquivalentImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEquivalentImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java
index 34670d8b..322e6710 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFalseImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFalseImpl.java
index 1db5a6b4..43a4cc77 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFalseImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFalseImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFofFormulaImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFofFormulaImpl.java
index beef8908..ac381744 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFofFormulaImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFofFormulaImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -382,7 +382,7 @@ public class VLSFofFormulaImpl extends MinimalEObjectImpl.Container implements V
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (name: ");
    result.append(name);
    result.append(", fofRole: ");
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionAsTermImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionAsTermImpl.java
new file mode 100644
index 00000000..1df29e68
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionAsTermImpl.java
@@ -0,0 +1,240 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>VLS Function As Term</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl#getFunctor <em>Functor</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl#getTerms <em>Terms</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VLSFunctionAsTermImpl extends VLSTermImpl implements VLSFunctionAsTerm
+{
+  /**
+   * The default value of the '{@link #getFunctor() <em>Functor</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getFunctor()
+   * @generated
+   * @ordered
+   */
+  protected static final String FUNCTOR_EDEFAULT = null;
+  /**
+   * The cached value of the '{@link #getFunctor() <em>Functor</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getFunctor()
+   * @generated
+   * @ordered
+   */
+  protected String functor = FUNCTOR_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getTerms() <em>Terms</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getTerms()
+   * @generated
+   * @ordered
+   */
+  protected EList<VLSTerm> terms;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected VLSFunctionAsTermImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return VampireLanguagePackage.Literals.VLS_FUNCTION_AS_TERM;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getFunctor()
+  {
+    return functor;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setFunctor(String newFunctor)
+  {
+    String oldFunctor = functor;
+    functor = newFunctor;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR, oldFunctor, functor));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<VLSTerm> getTerms()
+  {
+    if (terms == null)
+    {
+      terms = new EObjectContainmentEList<VLSTerm>(VLSTerm.class, this, VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS);
+    }
+    return terms;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS:
+        return ((InternalEList<?>)getTerms()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR:
+        return getFunctor();
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS:
+        return getTerms();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR:
+        setFunctor((String)newValue);
+        return;
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS:
+        getTerms().clear();
+        getTerms().addAll((Collection<? extends VLSTerm>)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR:
+        setFunctor(FUNCTOR_EDEFAULT);
+        return;
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS:
+        getTerms().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR:
+        return FUNCTOR_EDEFAULT == null ? functor != null : !FUNCTOR_EDEFAULT.equals(functor);
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS:
+        return terms != null && !terms.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (functor: ");
+    result.append(functor);
+    result.append(')');
+    return result.toString();
+  }
+} //VLSFunctionAsTermImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionImpl.java
index 49da58d4..219c0258 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -230,7 +230,7 @@ public class VLSFunctionImpl extends VLSTermImpl implements VLSFunction
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (constant: ");
    result.append(constant);
    result.append(')');
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSImpliesImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSImpliesImpl.java
index 3c8d9193..aabf8533 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSImpliesImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSImpliesImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java
index b37d97b4..47a9f4c6 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -231,7 +231,7 @@ public class VLSIncludeImpl extends MinimalEObjectImpl.Container implements VLSI
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (fileName: ");
    result.append(fileName);
    result.append(')');
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSInequalityImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSInequalityImpl.java
index ba409780..326b473b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSInequalityImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSInequalityImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIntImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIntImpl.java
index a513549a..44593a33 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIntImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIntImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSLessImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSLessImpl.java
index 71f2b9c8..a3571d34 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSLessImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSLessImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -230,7 +230,7 @@ public class VLSLessImpl extends VLSTermImpl implements VLSLess
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (name: ");
    result.append(name);
    result.append(')');
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java
index 5217696e..6863c49c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -168,7 +168,7 @@ public class VLSNameImpl extends MinimalEObjectImpl.Container implements VLSName
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (name: ");
    result.append(name);
    result.append(')');
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNandImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNandImpl.java
index ca157692..2e12ec98 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNandImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNandImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNorImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNorImpl.java
index b9d8eea4..5bc1f7da 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNorImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNorImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOrImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOrImpl.java
index dbe09020..80dbe94b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOrImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOrImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java
index 43f2b84b..c0960e3f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRealImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRealImpl.java
index 54789949..bedcde3e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRealImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRealImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRevImpliesImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRevImpliesImpl.java
index 2a0dbf03..97986a86 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRevImpliesImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRevImpliesImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSSatisfiableImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSSatisfiableImpl.java
index 0c591e2f..49ef1e74 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSSatisfiableImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSSatisfiableImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java
index 3766eae5..b556819f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java
index b20fa91c..b4ff1184 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -382,7 +382,7 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (name: ");
    result.append(name);
    result.append(", fofRole: ");
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTrueImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTrueImpl.java
index 3153600a..85913139 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTrueImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTrueImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUnaryNegationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUnaryNegationImpl.java
index 85dc0b1b..c315f189 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUnaryNegationImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUnaryNegationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java
index 5627cc4c..696a4889 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java
index 437bb72d..9ebed3eb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -167,7 +167,7 @@ public class VLSVariableImpl extends VLSTermImpl implements VLSVariable
  {
    if (eIsProxy()) return super.toString();
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
    result.append(" (name: ");
    result.append(name);
    result.append(')');
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSXnorImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSXnorImpl.java
index 0f9e5f5a..06b6bd92 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSXnorImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSXnorImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java
index c3c74fe9..a6b1ac36 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -76,7 +76,7 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
      case VampireLanguagePackage.VLS_ANNOTATION: return createVLSAnnotation();
      case VampireLanguagePackage.VLS_TERM: return createVLSTerm();
      case VampireLanguagePackage.VLS_VARIABLE: return createVLSVariable();
-      case VampireLanguagePackage.VLS_FUNCTION_FOF: return createVLSFunctionFof();
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM: return createVLSFunctionAsTerm();
      case VampireLanguagePackage.VLS_DEFINED_TERM: return createVLSDefinedTerm();
      case VampireLanguagePackage.VLS_EQUIVALENT: return createVLSEquivalent();
      case VampireLanguagePackage.VLS_IMPLIES: return createVLSImplies();
@@ -232,10 +232,10 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
   * <!-- end-user-doc -->
   * @generated
   */
-  public VLSFunctionFof createVLSFunctionFof()
+  public VLSFunctionAsTerm createVLSFunctionAsTerm()
  {
-    VLSFunctionFofImpl vlsFunctionFof = new VLSFunctionFofImpl();
+    VLSFunctionAsTermImpl vlsFunctionAsTerm = new VLSFunctionAsTermImpl();
-    return vlsFunctionFof;
+    return vlsFunctionAsTerm;
  }
  /**
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java
index 2b131272..2907b35d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
@@ -17,7 +17,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFalse;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;
-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality;
@@ -139,7 +139,7 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass vlsFunctionFofEClass = null;
+  private EClass vlsFunctionAsTermEClass = null;
  /**
   * <!-- begin-user-doc -->
@@ -338,7 +338,7 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
  /**
   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
   * <p>This method is used to initialize {@link VampireLanguagePackage#eINSTANCE} when that field is accessed.
   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
   * <!-- begin-user-doc -->
@@ -353,7 +353,8 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    if (isInited) return (VampireLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(VampireLanguagePackage.eNS_URI);
    // Obtain or create and register package
-    VampireLanguagePackageImpl theVampireLanguagePackage = (VampireLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VampireLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VampireLanguagePackageImpl());
+    Object registeredVampireLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+    VampireLanguagePackageImpl theVampireLanguagePackage = registeredVampireLanguagePackage instanceof VampireLanguagePackageImpl ? (VampireLanguagePackageImpl)registeredVampireLanguagePackage : new VampireLanguagePackageImpl();
    isInited = true;
@@ -366,7 +367,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    // Mark meta-data to indicate it can't be changed
    theVampireLanguagePackage.freeze();
-  
    // Update the registry and return the package
    EPackage.Registry.INSTANCE.put(VampireLanguagePackage.eNS_URI, theVampireLanguagePackage);
    return theVampireLanguagePackage;
@@ -697,9 +697,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
   * <!-- end-user-doc -->
   * @generated
   */
-  public EClass getVLSFunctionFof()
+  public EClass getVLSFunctionAsTerm()
  {
-    return vlsFunctionFofEClass;
+    return vlsFunctionAsTermEClass;
  }
  /**
@@ -707,9 +707,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
   * <!-- end-user-doc -->
   * @generated
   */
-  public EAttribute getVLSFunctionFof_Functor()
+  public EAttribute getVLSFunctionAsTerm_Functor()
  {
-    return (EAttribute)vlsFunctionFofEClass.getEStructuralFeatures().get(0);
+    return (EAttribute)vlsFunctionAsTermEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -717,9 +717,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
   * <!-- end-user-doc -->
   * @generated
   */
-  public EReference getVLSFunctionFof_Terms()
+  public EReference getVLSFunctionAsTerm_Terms()
  {
-    return (EReference)vlsFunctionFofEClass.getEStructuralFeatures().get(1);
+    return (EReference)vlsFunctionAsTermEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1365,9 +1365,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    vlsVariableEClass = createEClass(VLS_VARIABLE);
    createEAttribute(vlsVariableEClass, VLS_VARIABLE__NAME);
-    vlsFunctionFofEClass = createEClass(VLS_FUNCTION_FOF);
+    vlsFunctionAsTermEClass = createEClass(VLS_FUNCTION_AS_TERM);
-    createEAttribute(vlsFunctionFofEClass, VLS_FUNCTION_FOF__FUNCTOR);
+    createEAttribute(vlsFunctionAsTermEClass, VLS_FUNCTION_AS_TERM__FUNCTOR);
-    createEReference(vlsFunctionFofEClass, VLS_FUNCTION_FOF__TERMS);
+    createEReference(vlsFunctionAsTermEClass, VLS_FUNCTION_AS_TERM__TERMS);
    vlsDefinedTermEClass = createEClass(VLS_DEFINED_TERM);
    createEAttribute(vlsDefinedTermEClass, VLS_DEFINED_TERM__VALUE);
@@ -1482,7 +1482,7 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    // Add supertypes to classes
    vlsSatisfiableEClass.getESuperTypes().add(this.getVLSConfirmations());
    vlsVariableEClass.getESuperTypes().add(this.getVLSTerm());
-    vlsFunctionFofEClass.getESuperTypes().add(this.getVLSTerm());
+    vlsFunctionAsTermEClass.getESuperTypes().add(this.getVLSTerm());
    vlsDefinedTermEClass.getESuperTypes().add(this.getVLSTerm());
    vlsEquivalentEClass.getESuperTypes().add(this.getVLSTerm());
    vlsImpliesEClass.getESuperTypes().add(this.getVLSTerm());
@@ -1552,9 +1552,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    initEClass(vlsVariableEClass, VLSVariable.class, "VLSVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
    initEAttribute(getVLSVariable_Name(), ecorePackage.getEString(), "name", null, 0, 1, VLSVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(vlsFunctionFofEClass, VLSFunctionFof.class, "VLSFunctionFof", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(vlsFunctionAsTermEClass, VLSFunctionAsTerm.class, "VLSFunctionAsTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getVLSFunctionFof_Functor(), ecorePackage.getEString(), "functor", null, 0, 1, VLSFunctionFof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getVLSFunctionAsTerm_Functor(), ecorePackage.getEString(), "functor", null, 0, 1, VLSFunctionAsTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getVLSFunctionFof_Terms(), this.getVLSTerm(), null, "terms", null, 0, -1, VLSFunctionFof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getVLSFunctionAsTerm_Terms(), this.getVLSTerm(), null, "terms", null, 0, -1, VLSFunctionAsTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
    initEClass(vlsDefinedTermEClass, VLSDefinedTerm.class, "VLSDefinedTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
    initEAttribute(getVLSDefinedTerm_Value(), ecorePackage.getEString(), "value", null, 0, 1, VLSDefinedTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java
index 05b3086c..e0dcd099 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java
index 41e073ca..1d9a6b22 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.util;
@@ -131,9 +131,9 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
        return createVLSVariableAdapter();
      }
      @Override
-      public Adapter caseVLSFunctionFof(VLSFunctionFof object)
+      public Adapter caseVLSFunctionAsTerm(VLSFunctionAsTerm object)
      {
-        return createVLSFunctionFofAdapter();
+        return createVLSFunctionAsTermAdapter();
      }
      @Override
      public Adapter caseVLSDefinedTerm(VLSDefinedTerm object)
@@ -443,16 +443,16 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
  }
  /**
-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof <em>VLS Function Fof</em>}'.
+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm <em>VLS Function As Term</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm
   * @generated
   */
-  public Adapter createVLSFunctionFofAdapter()
+  public Adapter createVLSFunctionAsTermAdapter()
  {
    return null;
  }
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java
index 24ad4238..3b7106f8 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
 */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.util;
@@ -152,11 +152,11 @@ public class VampireLanguageSwitch<T> extends Switch<T>
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case VampireLanguagePackage.VLS_FUNCTION_FOF:
+      case VampireLanguagePackage.VLS_FUNCTION_AS_TERM:
      {
-        VLSFunctionFof vlsFunctionFof = (VLSFunctionFof)theEObject;
+        VLSFunctionAsTerm vlsFunctionAsTerm = (VLSFunctionAsTerm)theEObject;
-        T result = caseVLSFunctionFof(vlsFunctionFof);
+        T result = caseVLSFunctionAsTerm(vlsFunctionAsTerm);
-        if (result == null) result = caseVLSTerm(vlsFunctionFof);
+        if (result == null) result = caseVLSTerm(vlsFunctionAsTerm);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
@@ -537,17 +537,17 @@ public class VampireLanguageSwitch<T> extends Switch<T>
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>VLS Function Fof</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>VLS Function As Term</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>VLS Function Fof</em>'.
+   * @return the result of interpreting the object as an instance of '<em>VLS Function As Term</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseVLSFunctionFof(VLSFunctionFof object)
+  public T caseVLSFunctionAsTerm(VLSFunctionAsTerm object)
  {
    return null;
  }